Skip to content

Cherry-pick #7216 pool replacement to 6.x LTS (excluding ci.yml)#7227

Merged
achamayou merged 3 commits into
release/6.xfrom
copilot/fix-a6738904-df5d-478a-958c-e254a8048201
Aug 28, 2025
Merged

Cherry-pick #7216 pool replacement to 6.x LTS (excluding ci.yml)#7227
achamayou merged 3 commits into
release/6.xfrom
copilot/fix-a6738904-df5d-478a-958c-e254a8048201

Conversation

Copy link
Copy Markdown
Contributor

Copilot AI commented Aug 28, 2025

This PR backports the pool replacement from #7216 "Replace virtual pool use with d16av5" to the 6.x LTS branch, excluding changes to ci.yml that are incompatible with the 6.x release workflow.

Changes

Updates GitHub Actions workflow configurations to replace the deprecated gha-virtual-ccf-sub pool with gha-vmss-d16av5-ci across virtual runners in most workflow files. The ci.yml file is excluded from this backport as it already uses the correct pool names in 6.x and the new jobs from main are not compatible with the 6.x branch.

Files Modified

  • .github/workflows/ci-verification.yml - Updated 3 jobs
  • .github/workflows/codeql-analysis.yml - Updated 1 job
  • .github/workflows/long-test.yml - Updated 6 jobs
  • .github/workflows/long-verification.yml - Updated 2 jobs
  • .github/workflows/release.yml - Updated 3 jobs

Excluded: .github/workflows/ci.yml - This file already had the correct pool configuration in 6.x and the new jobs/steps from main are not compatible with the 6.x release workflow.

Conflict Resolution

During the cherry-pick process, conflicts were resolved to preserve 6.x-specific features:

  • release.yml: Preserved the strategy matrix for platform builds (virtual/snp) that is specific to the 6.x release workflow

Testing

Verified that:

  • All instances of gha-virtual-ccf-sub have been replaced with gha-vmss-d16av5-ci in applicable workflow files
  • No old pool references remain in any workflow files
  • 6.x-specific workflow features are preserved and functional
  • The ci.yml file maintains its existing 6.x-compatible configuration

This backport ensures that 6.x branch CI/CD will continue to function with the updated Azure DevOps pool infrastructure while maintaining full compatibility with existing 6.x-specific workflow configurations.


💬 Share your feedback on Copilot coding agent for the chance to win a $200 gift card! Click here to start the survey.

Co-authored-by: Amaury Chamayou <amchamay@microsoft.com>
Co-authored-by: Amaury Chamayou <amaury@xargs.fr>
Copilot AI changed the title [WIP] Please backport #7216 to release/6.x by cherry-picking the commit, and add the label "6.x-backport" to the PR you create. Cherry-pick #7216 to 6.x LTS Aug 28, 2025
Copilot AI requested a review from achamayou August 28, 2025 12:25
@achamayou
Copy link
Copy Markdown
Member

@copilot great start, but please do not backport any of the changes to the ci.yml file, the new steps and jobs there will not work on release/6.x. The other files look good though.

Co-authored-by: achamayou <4016369+achamayou@users.noreply.github.com>
Copy link
Copy Markdown
Contributor Author

Copilot AI commented Aug 28, 2025

@copilot great start, but please do not backport any of the changes to the ci.yml file, the new steps and jobs there will not work on release/6.x. The other files look good though.

Reverted all changes to ci.yml as requested. The new jobs and Python package test step that are incompatible with 6.x have been removed. The other workflow files still maintain the pool replacements from gha-virtual-ccf-sub to gha-vmss-d16av5-ci. (d98e5cf)

Copilot AI changed the title Cherry-pick #7216 to 6.x LTS Cherry-pick #7216 pool replacement to 6.x LTS (excluding ci.yml) Aug 28, 2025
@achamayou achamayou marked this pull request as ready for review August 28, 2025 13:06
@achamayou achamayou requested a review from a team as a code owner August 28, 2025 13:06
@achamayou achamayou self-requested a review August 28, 2025 13:06
@achamayou achamayou added the 6.x-backport Highlight PRs targeting the 6.x branch label Aug 28, 2025
@achamayou achamayou merged commit 7d0cdd0 into release/6.x Aug 28, 2025
33 checks passed
@achamayou achamayou deleted the copilot/fix-a6738904-df5d-478a-958c-e254a8048201 branch August 28, 2025 14:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.x-backport Highlight PRs targeting the 6.x branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants