diff --git a/eng/pipelines/ci.yml b/eng/pipelines/ci.yml index 3d30de6b0fd..56c8b5d51ee 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 @@ -46,32 +51,40 @@ jobs: matrix: Linux_Python3.9: OSName: "Linux" - OSVmImage: "MMSUbuntu18.04" + Pool: ${{ variables.LINUXPOOL }} + OSVmImage: ${{ variables.LINUXVMIMAGE}} PythonVersion: "3.9" Windows_Python3.9: OSName: "Windows" - OSVmImage: "MMS2020" - PythonVersion: "3.9" + # TODO: Update to WINDOWSPOOL and WINDOWSVMIMAGE once tests pass + Pool: ${{ variables.LINUXPOOL }} + OSVmImage: ${{ variables.LINUXVMIMAGE}} + PythonVersion: "3.9" Linux_Python3.10: OSName: "Linux" - OSVmImage: "MMSUbuntu20.04" + Pool: ${{ variables.LINUXPOOL }} + OSVmImage: ${{ variables.LINUXVMIMAGE}} PythonVersion: "3.10" Linux_Python3.11: OSName: "Linux" - OSVmImage: "MMSUbuntu22.04" + Pool: ${{ variables.LINUXPOOL }} + OSVmImage: ${{ variables.LINUXVMIMAGE}} PythonVersion: "3.11" Linux_Python3.12: OSName: "Linux" - OSVmImage: "MMSUbuntu22.04" + Pool: ${{ variables.LINUXPOOL }} + OSVmImage: ${{ variables.LINUXVMIMAGE}} PythonVersion: "3.12" Windows_Python3.12: OSName: "Windows" - OSVmImage: "MMS2023" + # TODO: Update to WINDOWSPOOL and WINDOWSVMIMAGE once tests pass + Pool: ${{ variables.LINUXPOOL }} + OSVmImage: ${{ variables.LINUXVMIMAGE}} 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 +152,40 @@ jobs: matrix: Linux_Python3.9: OSName: "Linux" - OSVmImage: "MMSUbuntu18.04" + Pool: ${{ variables.LINUXPOOL }} + OSVmImage: ${{ variables.LINUXVMIMAGE}} PythonVersion: "3.9" Windows_Python3.9: OSName: "Windows" - OSVmImage: "MMS2020" + # TODO: Update to WINDOWSPOOL and WINDOWSVMIMAGE once tests pass + Pool: ${{ variables.LINUXPOOL }} + OSVmImage: ${{ variables.LINUXVMIMAGE}} PythonVersion: "3.9" Linux_Python310: OSName: "Linux" - OSVmImage: "MMSUbuntu20.04" + Pool: ${{ variables.LINUXPOOL }} + OSVmImage: ${{ variables.LINUXVMIMAGE}} PythonVersion: "3.10" Linux_Python311: OSName: "Linux" - OSVmImage: "MMSUbuntu22.04" + Pool: ${{ variables.LINUXPOOL }} + OSVmImage: ${{ variables.LINUXVMIMAGE}} PythonVersion: "3.11" Linux_Python312: OSName: "Linux" - OSVmImage: "MMSUbuntu22.04" + Pool: ${{ variables.LINUXPOOL }} + OSVmImage: ${{ variables.LINUXVMIMAGE}} PythonVersion: "3.12" Windows_Python312: OSName: "Windows" - OSVmImage: "MMS2023" + # TODO: Update to WINDOWSPOOL and WINDOWSVMIMAGE once tests pass + Pool: ${{ variables.LINUXPOOL }} + OSVmImage: ${{ variables.LINUXVMIMAGE}} PythonVersion: "3.12" pool: - name: azsdk-pool-mms-ubuntu-2004-general - vmImage: $(OSVmImage) + name: $(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