Skip to content

flowey: Fix PR collision#3201

Merged
smalis-msft merged 1 commit intomicrosoft:mainfrom
smalis-msft:fix-ci
Apr 6, 2026
Merged

flowey: Fix PR collision#3201
smalis-msft merged 1 commit intomicrosoft:mainfrom
smalis-msft:fix-ci

Conversation

@smalis-msft
Copy link
Copy Markdown
Contributor

#3143 renamed our CI pools at the same time as #3161 added a new test on the old pools. Fix this up.

@smalis-msft smalis-msft requested a review from a team as a code owner April 6, 2026 16:31
Copilot AI review requested due to automatic review settings April 6, 2026 16:31
@smalis-msft smalis-msft requested a review from a team as a code owner April 6, 2026 16:31
@smalis-msft smalis-msft enabled auto-merge (squash) April 6, 2026 16:31
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Fixes a CI configuration collision where the mi-secure OpenHCL gates were still targeting the pre-#3143 runner pools/images, by switching them to the updated 1ES pool/image identifiers across Flowey pipeline generation and the generated CI YAMLs.

Changes:

  • Update mi-secure build/test gates in checkin_gates.rs to use gh_pools::{linux_1es, windows_intel_1es}.
  • Regenerate ADO pipeline YAML to use the new pool name + 1ES.ImageOverride demand format for the mi-secure jobs.
  • Regenerate GitHub Actions workflows to use the new 1ES.Pool=... / 1ES.ImageOverride=... labels for the mi-secure jobs.

Reviewed changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated no comments.

Show a summary per file
File Description
flowey/flowey_hvlite/src/pipelines/checkin_gates.rs Switch mi-secure gates to the new GitHub 1ES runner pools.
ci-flowey/openvmm-pr.yaml Update ADO pool config for mi-secure jobs to new pool + image demand format.
.github/workflows/openvmm-pr.yaml Update mi-secure jobs’ runs-on labels to new 1ES pool/image identifiers.
.github/workflows/openvmm-pr-release.yaml Same 1ES pool/image label updates for PR-release workflow.
.github/workflows/openvmm-ci.yaml Same 1ES pool/image label updates for CI workflow.

@smalis-msft smalis-msft merged commit bc9234a into microsoft:main Apr 6, 2026
65 checks passed
@smalis-msft smalis-msft deleted the fix-ci branch April 6, 2026 17:34
moor-coding pushed a commit to moor-coding/openvmm that referenced this pull request Apr 13, 2026
microsoft#3143 renamed our CI pools at
the same time as microsoft#3161 added a
new test on the old pools. Fix this up.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants