From b8419b4a212290860d8bc54b4a251c8d0f9c6a2c Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Tue, 24 Jun 2025 06:15:24 +0000 Subject: [PATCH 1/5] [EngSys] Update agent pool to "azsdk-pool" --- eng/pipelines/ci.yml | 53 +++++++++++-------- eng/pipelines/preview.yml | 8 +-- eng/pipelines/sdk_regenerate.yaml | 11 ++-- .../templates/stages/1es-redirect.yml | 4 +- eng/pipelines/templates/variables/image.yml | 10 ++-- 5 files changed, 50 insertions(+), 36 deletions(-) diff --git a/eng/pipelines/ci.yml b/eng/pipelines/ci.yml index 3d30de6b0fd..25c942b7c60 100644 --- a/eng/pipelines/ci.yml +++ b/eng/pipelines/ci.yml @@ -18,10 +18,15 @@ resources: name: Azure/azure-sdk-tools variables: - PythonVersion: "3.12" - AUTOREST_TESTSERVER_COVERAGE_DIRECTORY: "$(Build.SourcesDirectory)/autorest.python/packages/autorest.python/coverage/" - PROXY_URL: http://localhost:5000 - PROXY_MANUAL_START: true + - template: /eng/pipelines/templates/variables/image.yml + - name: PythonVersion + value: "3.12" + - name: AUTOREST_TESTSERVER_COVERAGE_DIRECTORY + value: "$(Build.SourcesDirectory)/autorest.python/packages/autorest.python/coverage/" + - name: PROXY_URL + value: http://localhost:5000 + - name : PROXY_MANUAL_START + value: true parameters: - name: VerificationPackages @@ -45,33 +50,39 @@ jobs: strategy: matrix: Linux_Python3.9: + Pool: $(LINUXPOOL) OSName: "Linux" - OSVmImage: "MMSUbuntu18.04" + OSVmImage: $(LINUXVMIMAGE) PythonVersion: "3.9" Windows_Python3.9: + Pool: $(WINDOWSPOOL) OSName: "Windows" - OSVmImage: "MMS2020" - PythonVersion: "3.9" + OSVmImage: $(WINDOWSVMIMAGE) + PythonVersion: "3.9" Linux_Python3.10: + Pool: $(LINUXPOOL) OSName: "Linux" - OSVmImage: "MMSUbuntu20.04" + OSVmImage: $(LINUXVMIMAGE) PythonVersion: "3.10" Linux_Python3.11: + Pool: $(LINUXPOOL) OSName: "Linux" - OSVmImage: "MMSUbuntu22.04" + OSVmImage: $(LINUXVMIMAGE) PythonVersion: "3.11" Linux_Python3.12: + Pool: $(LINUXPOOL) OSName: "Linux" - OSVmImage: "MMSUbuntu22.04" + OSVmImage: $(LINUXVMIMAGE) PythonVersion: "3.12" Windows_Python3.12: + Pool: $(WINDOWSPOOL) OSName: "Windows" - OSVmImage: "MMS2023" + OSVmImage: $(WINDOWSVMIMAGE) PythonVersion: "3.12" pool: - name: azsdk-pool-mms-ubuntu-2004-general - vmImage: $(OSVmImage) + name: $(Pool) + demands: ImageOverride -equals $(OSVmImage) steps: - template: ci-template.yml @@ -139,32 +150,32 @@ jobs: matrix: Linux_Python3.9: OSName: "Linux" - OSVmImage: "MMSUbuntu18.04" + OSVmImage: $(LINUXVMIMAGE) PythonVersion: "3.9" Windows_Python3.9: OSName: "Windows" - OSVmImage: "MMS2020" + OSVmImage: $(WINDOWSVMIMAGE) PythonVersion: "3.9" Linux_Python310: OSName: "Linux" - OSVmImage: "MMSUbuntu20.04" + OSVmImage: $(LINUXVMIMAGE) PythonVersion: "3.10" Linux_Python311: OSName: "Linux" - OSVmImage: "MMSUbuntu22.04" + OSVmImage: $(LINUXVMIMAGE) PythonVersion: "3.11" Linux_Python312: OSName: "Linux" - OSVmImage: "MMSUbuntu22.04" + OSVmImage: $(LINUXVMIMAGE) PythonVersion: "3.12" Windows_Python312: OSName: "Windows" - OSVmImage: "MMS2023" + OSVmImage: $(WINDOWSVMIMAGE) PythonVersion: "3.12" pool: - name: azsdk-pool-mms-ubuntu-2004-general - vmImage: $(OSVmImage) + name: azsdk-pool + demands: ImageOverride -equals $(OSVmImage) steps: - template: ci-template.yml diff --git a/eng/pipelines/preview.yml b/eng/pipelines/preview.yml index 84ce3fac5c6..4040a149350 100644 --- a/eng/pipelines/preview.yml +++ b/eng/pipelines/preview.yml @@ -30,11 +30,13 @@ resources: ref: refs/heads/main variables: - PythonVersion: "3.10" + - template: /eng/pipelines/templates/variables/image.yml + - name: PythonVersion + value: "3.10" pool: - name: azsdk-pool-mms-ubuntu-2004-general - vmImage: MMSUbuntu20.04 + name: $(LINUXPOOL) + demands: ImageOverride -equals $(LINUXVMIMAGE) extends: template: eng/pipelines/templates/stages/archetype-autorest-preview.yml@azure-sdk-tools diff --git a/eng/pipelines/sdk_regenerate.yaml b/eng/pipelines/sdk_regenerate.yaml index 38154bae8e6..8233ce5ea52 100644 --- a/eng/pipelines/sdk_regenerate.yaml +++ b/eng/pipelines/sdk_regenerate.yaml @@ -12,13 +12,14 @@ schedules: pr: none -pool: - name: "azsdk-pool-mms-ubuntu-2004-general" - vmImage: "MMSUbuntu20.04" - variables: - - group: Release Secrets for GitHub + - template: /eng/pipelines/templates/variables/image.yml + - name: group + value: Release Secrets for GitHub +pool: + name: $(LINUXPOOL) + demands: ImageOverride -equals $(LINUXVMIMAGE) resources: repositories: diff --git a/eng/pipelines/templates/stages/1es-redirect.yml b/eng/pipelines/templates/stages/1es-redirect.yml index bb78a16005a..1e813af7895 100644 --- a/eng/pipelines/templates/stages/1es-redirect.yml +++ b/eng/pipelines/templates/stages/1es-redirect.yml @@ -23,8 +23,8 @@ extends: skipBuildTagsForGitHubPullRequests: true sdl: sourceAnalysisPool: - name: azsdk-pool-mms-win-2022-general - image: azsdk-pool-mms-win-2022-1espt + name: azsdk-pool + image: windows-2022 os: windows psscriptanalyzer: compiled: true diff --git a/eng/pipelines/templates/variables/image.yml b/eng/pipelines/templates/variables/image.yml index a7ce2512066..2bd105c720d 100644 --- a/eng/pipelines/templates/variables/image.yml +++ b/eng/pipelines/templates/variables/image.yml @@ -2,18 +2,18 @@ variables: - name: LINUXPOOL - value: azsdk-pool-mms-ubuntu-2004-general + value: azsdk-pool - name: WINDOWSPOOL - value: azsdk-pool-mms-win-2022-general + value: azsdk-pool - name: MACPOOL value: Azure Pipelines - name: LINUXVMIMAGE - value: azsdk-pool-mms-ubuntu-2004-1espt + value: ubuntu-24.04 - name: LINUXNEXTVMIMAGE - value: ubuntu-22.04 + value: ubuntu-24.04 - name: WINDOWSVMIMAGE - value: azsdk-pool-mms-win-2022-1espt + value: windows-2022 - name: MACVMIMAGE value: macos-11 From 01851bf5709c49243922981afab82e3307290358 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Tue, 24 Jun 2025 06:29:05 +0000 Subject: [PATCH 2/5] Use correct syntax in matrix --- eng/pipelines/ci.yml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/pipelines/ci.yml b/eng/pipelines/ci.yml index 25c942b7c60..06c3e58cf2c 100644 --- a/eng/pipelines/ci.yml +++ b/eng/pipelines/ci.yml @@ -50,34 +50,34 @@ jobs: strategy: matrix: Linux_Python3.9: - Pool: $(LINUXPOOL) + Pool: ${{ variables.LINUXPOOL }} OSName: "Linux" - OSVmImage: $(LINUXVMIMAGE) + OSVmImage: ${{ variables.LINUXVMIMAGE}} PythonVersion: "3.9" Windows_Python3.9: - Pool: $(WINDOWSPOOL) + Pool: ${{ variables.WINDOWSPOOL }} OSName: "Windows" - OSVmImage: $(WINDOWSVMIMAGE) + OSVmImage: ${{ variables.WINDOWSVMIMAGE}} PythonVersion: "3.9" Linux_Python3.10: - Pool: $(LINUXPOOL) + Pool: ${{ variables.LINUXPOOL }} OSName: "Linux" - OSVmImage: $(LINUXVMIMAGE) + OSVmImage: ${{ variables.LINUXVMIMAGE}} PythonVersion: "3.10" Linux_Python3.11: - Pool: $(LINUXPOOL) + Pool: ${{ variables.LINUXPOOL }} OSName: "Linux" - OSVmImage: $(LINUXVMIMAGE) + OSVmImage: ${{ variables.LINUXVMIMAGE}} PythonVersion: "3.11" Linux_Python3.12: - Pool: $(LINUXPOOL) + Pool: ${{ variables.LINUXPOOL }} OSName: "Linux" - OSVmImage: $(LINUXVMIMAGE) + OSVmImage: ${{ variables.LINUXVMIMAGE}} PythonVersion: "3.12" Windows_Python3.12: - Pool: $(WINDOWSPOOL) + Pool: ${{ variables.WINDOWSPOOL }} OSName: "Windows" - OSVmImage: $(WINDOWSVMIMAGE) + OSVmImage: ${{ variables.WINDOWSVMIMAGE}} PythonVersion: "3.12" pool: @@ -150,27 +150,27 @@ jobs: matrix: Linux_Python3.9: OSName: "Linux" - OSVmImage: $(LINUXVMIMAGE) + OSVmImage: ${{ variables.LINUXVMIMAGE}} PythonVersion: "3.9" Windows_Python3.9: OSName: "Windows" - OSVmImage: $(WINDOWSVMIMAGE) + OSVmImage: ${{ variables.WINDOWSVMIMAGE}} PythonVersion: "3.9" Linux_Python310: OSName: "Linux" - OSVmImage: $(LINUXVMIMAGE) + OSVmImage: ${{ variables.LINUXVMIMAGE}} PythonVersion: "3.10" Linux_Python311: OSName: "Linux" - OSVmImage: $(LINUXVMIMAGE) + OSVmImage: ${{ variables.LINUXVMIMAGE}} PythonVersion: "3.11" Linux_Python312: OSName: "Linux" - OSVmImage: $(LINUXVMIMAGE) + OSVmImage: ${{ variables.LINUXVMIMAGE}} PythonVersion: "3.12" Windows_Python312: OSName: "Windows" - OSVmImage: $(WINDOWSVMIMAGE) + OSVmImage: ${{ variables.WINDOWSVMIMAGE}} PythonVersion: "3.12" pool: From 4f8903bfff3b0786d2abacef63882bb0bcc2a618 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Tue, 24 Jun 2025 06:32:13 +0000 Subject: [PATCH 3/5] more pool vars --- eng/pipelines/ci.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/ci.yml b/eng/pipelines/ci.yml index 06c3e58cf2c..d78f488a531 100644 --- a/eng/pipelines/ci.yml +++ b/eng/pipelines/ci.yml @@ -149,32 +149,38 @@ jobs: strategy: matrix: Linux_Python3.9: + Pool: ${{ variables.LINUXPOOL }} OSName: "Linux" OSVmImage: ${{ variables.LINUXVMIMAGE}} PythonVersion: "3.9" Windows_Python3.9: + Pool: ${{ variables.WINDOWSPOOL }} OSName: "Windows" OSVmImage: ${{ variables.WINDOWSVMIMAGE}} PythonVersion: "3.9" Linux_Python310: + Pool: ${{ variables.LINUXPOOL }} OSName: "Linux" OSVmImage: ${{ variables.LINUXVMIMAGE}} PythonVersion: "3.10" Linux_Python311: + Pool: ${{ variables.LINUXPOOL }} OSName: "Linux" OSVmImage: ${{ variables.LINUXVMIMAGE}} PythonVersion: "3.11" Linux_Python312: + Pool: ${{ variables.LINUXPOOL }} OSName: "Linux" OSVmImage: ${{ variables.LINUXVMIMAGE}} PythonVersion: "3.12" Windows_Python312: + Pool: ${{ variables.WINDOWSPOOL }} OSName: "Windows" OSVmImage: ${{ variables.WINDOWSVMIMAGE}} PythonVersion: "3.12" pool: - name: azsdk-pool + name: $(Pool) demands: ImageOverride -equals $(OSVmImage) steps: From b991c44848789cc698fdb2a7d50e6eaaaae88a99 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Fri, 27 Jun 2025 17:48:14 +0000 Subject: [PATCH 4/5] run windows on linux --- eng/pipelines/ci.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/eng/pipelines/ci.yml b/eng/pipelines/ci.yml index d78f488a531..d2c7b52551a 100644 --- a/eng/pipelines/ci.yml +++ b/eng/pipelines/ci.yml @@ -50,34 +50,36 @@ jobs: strategy: matrix: Linux_Python3.9: - Pool: ${{ variables.LINUXPOOL }} OSName: "Linux" + Pool: ${{ variables.LINUXPOOL }} OSVmImage: ${{ variables.LINUXVMIMAGE}} PythonVersion: "3.9" Windows_Python3.9: - Pool: ${{ variables.WINDOWSPOOL }} OSName: "Windows" - OSVmImage: ${{ variables.WINDOWSVMIMAGE}} + # TODO: Update to WINDOWSPOOL and WINDOWSVMIMAGE once tests pass + Pool: ${{ variables.LINUXPOOL }} + OSVmImage: ${{ variables.LINUXVMIMAGE}} PythonVersion: "3.9" Linux_Python3.10: - Pool: ${{ variables.LINUXPOOL }} OSName: "Linux" + Pool: ${{ variables.LINUXPOOL }} OSVmImage: ${{ variables.LINUXVMIMAGE}} PythonVersion: "3.10" Linux_Python3.11: - Pool: ${{ variables.LINUXPOOL }} OSName: "Linux" + Pool: ${{ variables.LINUXPOOL }} OSVmImage: ${{ variables.LINUXVMIMAGE}} PythonVersion: "3.11" Linux_Python3.12: - Pool: ${{ variables.LINUXPOOL }} OSName: "Linux" + Pool: ${{ variables.LINUXPOOL }} OSVmImage: ${{ variables.LINUXVMIMAGE}} PythonVersion: "3.12" Windows_Python3.12: - Pool: ${{ variables.WINDOWSPOOL }} OSName: "Windows" - OSVmImage: ${{ variables.WINDOWSVMIMAGE}} + # TODO: Update to WINDOWSPOOL and WINDOWSVMIMAGE once tests pass + Pool: ${{ variables.LINUXPOOL }} + OSVmImage: ${{ variables.LINUXVMIMAGE}} PythonVersion: "3.12" pool: From ccb6b2a5b90d631b6196d05e31a8c4e943c8a030 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Fri, 27 Jun 2025 17:52:22 +0000 Subject: [PATCH 5/5] Update second matrix --- eng/pipelines/ci.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/eng/pipelines/ci.yml b/eng/pipelines/ci.yml index d2c7b52551a..56c8b5d51ee 100644 --- a/eng/pipelines/ci.yml +++ b/eng/pipelines/ci.yml @@ -151,34 +151,36 @@ jobs: strategy: matrix: Linux_Python3.9: - Pool: ${{ variables.LINUXPOOL }} OSName: "Linux" + Pool: ${{ variables.LINUXPOOL }} OSVmImage: ${{ variables.LINUXVMIMAGE}} PythonVersion: "3.9" Windows_Python3.9: - Pool: ${{ variables.WINDOWSPOOL }} OSName: "Windows" - OSVmImage: ${{ variables.WINDOWSVMIMAGE}} + # TODO: Update to WINDOWSPOOL and WINDOWSVMIMAGE once tests pass + Pool: ${{ variables.LINUXPOOL }} + OSVmImage: ${{ variables.LINUXVMIMAGE}} PythonVersion: "3.9" Linux_Python310: - Pool: ${{ variables.LINUXPOOL }} OSName: "Linux" + Pool: ${{ variables.LINUXPOOL }} OSVmImage: ${{ variables.LINUXVMIMAGE}} PythonVersion: "3.10" Linux_Python311: - Pool: ${{ variables.LINUXPOOL }} OSName: "Linux" + Pool: ${{ variables.LINUXPOOL }} OSVmImage: ${{ variables.LINUXVMIMAGE}} PythonVersion: "3.11" Linux_Python312: - Pool: ${{ variables.LINUXPOOL }} OSName: "Linux" + Pool: ${{ variables.LINUXPOOL }} OSVmImage: ${{ variables.LINUXVMIMAGE}} PythonVersion: "3.12" Windows_Python312: - Pool: ${{ variables.WINDOWSPOOL }} OSName: "Windows" - OSVmImage: ${{ variables.WINDOWSVMIMAGE}} + # TODO: Update to WINDOWSPOOL and WINDOWSVMIMAGE once tests pass + Pool: ${{ variables.LINUXPOOL }} + OSVmImage: ${{ variables.LINUXVMIMAGE}} PythonVersion: "3.12" pool: