From 4207b9f110dceb06adf7cd285e5c264ff2245a33 Mon Sep 17 00:00:00 2001 From: Scott Beddall <45376673+scbedd@users.noreply.github.com> Date: Mon, 11 Mar 2024 16:19:26 -0700 Subject: [PATCH] Remaining livetest matrices, `ci.yml` uses `image.yml` variables (#34727) * ensure that image.yml is populated everywhere * update ci.yml to also use the variables as provided by image.yml * update gitignore so that our updates don't break anyone's analyze * ensure analyze weekly runs on the correct job --- .vscode/cspell.json | 3 ++ eng/pipelines/templates/jobs/ci.yml | 28 +++++++++---------- eng/pipelines/templates/jobs/live.tests.yml | 1 + .../templates/stages/archetype-sdk-client.yml | 1 + .../templates/stages/platform-matrix-ai.json | 10 +++---- .../stages/python-analyze-weekly.yml | 9 ++++-- .../phonenumbers-livetest-matrix.json | 20 ++++++------- sdk/cosmos/cosmos-emulator-matrix.json | 2 +- sdk/identity/platform-matrix-integration.json | 4 +-- sdk/identity/platform-matrix.json | 4 +-- .../azure-keyvault-keys/platform-matrix.json | 4 +-- sdk/storage/platform-matrix-all-versions.json | 10 +++---- 12 files changed, 52 insertions(+), 44 deletions(-) diff --git a/.vscode/cspell.json b/.vscode/cspell.json index ca21e5ade2ac..2fc6fd283d29 100644 --- a/.vscode/cspell.json +++ b/.vscode/cspell.json @@ -454,6 +454,9 @@ "amltemp", "deserializers", "dicom", + "WINDOWSVMIMAGE", + "LINUXVMIMAGE", + "MACVMIMAGE" ], "overrides": [ { diff --git a/eng/pipelines/templates/jobs/ci.yml b/eng/pipelines/templates/jobs/ci.yml index f30d5b0a9ed3..1cf52e53ce43 100644 --- a/eng/pipelines/templates/jobs/ci.yml +++ b/eng/pipelines/templates/jobs/ci.yml @@ -72,8 +72,8 @@ jobs: timeoutInMinutes: 90 pool: - name: azsdk-pool-mms-ubuntu-2004-general - image: azsdk-pool-mms-ubuntu-2004-1espt + name: $(LINUXPOOL) + image: $(LINUXVMIMAGE) os: linux steps: @@ -93,8 +93,8 @@ jobs: timeoutInMinutes: 90 pool: - name: azsdk-pool-mms-ubuntu-2004-general - image: azsdk-pool-mms-ubuntu-2004-1espt + name: $(LINUXPOOL) + image: $(LINUXVMIMAGE) os: linux steps: @@ -114,8 +114,8 @@ jobs: timeoutInMinutes: 90 pool: - name: azsdk-pool-mms-win-2022-general - image: azsdk-pool-mms-win-2022-1espt + name: $(WINDOWSPOOL) + image: $(WINDOWSVMIMAGE) os: windows steps: @@ -135,8 +135,8 @@ jobs: timeoutInMinutes: 90 pool: - name: 'Azure Pipelines' - vmImage: macos-11 + name: $(MACPOOL) + vmImage: $(MACVMIMAGE) os: macOS steps: @@ -161,8 +161,8 @@ jobs: timeoutInMinutes: 90 pool: - name: azsdk-pool-mms-ubuntu-2004-general - image: azsdk-pool-mms-ubuntu-2004-1espt + name: $(LINUXPOOL) + image: $(LINUXVMIMAGE) os: linux steps: @@ -197,8 +197,8 @@ jobs: timeoutInMinutes: 90 pool: - name: azsdk-pool-mms-ubuntu-2004-general - image: azsdk-pool-mms-ubuntu-2004-1espt + name: $(LINUXPOOL) + image: $(LINUXVMIMAGE) os: linux steps: @@ -223,8 +223,8 @@ jobs: - 'Build_Extended' pool: - name: azsdk-pool-mms-ubuntu-2004-general - image: azsdk-pool-mms-ubuntu-2004-1espt + name: $(LINUXPOOL) + image: $(LINUXVMIMAGE) os: linux steps: diff --git a/eng/pipelines/templates/jobs/live.tests.yml b/eng/pipelines/templates/jobs/live.tests.yml index fb8fc5acee78..ac41fda33243 100644 --- a/eng/pipelines/templates/jobs/live.tests.yml +++ b/eng/pipelines/templates/jobs/live.tests.yml @@ -74,6 +74,7 @@ jobs: variables: - template: ../variables/globals.yml + - template: ../variables/image.yml - name: skipComponentGovernanceDetection value: true diff --git a/eng/pipelines/templates/stages/archetype-sdk-client.yml b/eng/pipelines/templates/stages/archetype-sdk-client.yml index 08be0b672594..b38a73fc6c5b 100644 --- a/eng/pipelines/templates/stages/archetype-sdk-client.yml +++ b/eng/pipelines/templates/stages/archetype-sdk-client.yml @@ -146,6 +146,7 @@ extends: variables: - template: /eng/pipelines/templates/variables/globals.yml@self + - template: /eng/pipelines/templates/variables/image.yml@self # The Prerelease and Release stages are conditioned on whether we are building a pull request and the branch. - ${{if and(in(variables['Build.Reason'], 'Manual', ''), eq(variables['System.TeamProject'], 'internal'))}}: diff --git a/eng/pipelines/templates/stages/platform-matrix-ai.json b/eng/pipelines/templates/stages/platform-matrix-ai.json index f46b166ac1af..6a056ce2280b 100644 --- a/eng/pipelines/templates/stages/platform-matrix-ai.json +++ b/eng/pipelines/templates/stages/platform-matrix-ai.json @@ -6,9 +6,9 @@ }, "matrix": { "Agent": { - "windows-2022": { "OSVmImage": "MMS2022", "Pool": "azsdk-pool-mms-win-2022-general" }, - "ubuntu-20.04": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" }, - "macos-11": { "OSVmImage": "macos-11", "Pool": "Azure Pipelines" } + "windows-2022": { "OSVmImage": "env:WINDOWSVMIMAGE", "Pool": "env:WINDOWSPOOL" }, + "ubuntu-20.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" }, + "macos-11": { "OSVmImage": "env:MACVMIMAGE", "Pool": "env:MACPOOL" } }, "PythonVersion": ["3.8", "3.10", "3.11" ], "CoverageArg": "--disablecov", @@ -18,8 +18,8 @@ { "CoverageConfig": { "ubuntu2004_39_coverage": { - "OSVmImage": "MMSUbuntu20.04", - "Pool": "azsdk-pool-mms-ubuntu-2004-general", + "OSVmImage": "env:LINUXVMIMAGE", + "Pool": "env:LINUXPOOL", "PythonVersion": "3.9", "CoverageArg": "", "TestSamples": "false" diff --git a/eng/pipelines/templates/stages/python-analyze-weekly.yml b/eng/pipelines/templates/stages/python-analyze-weekly.yml index 674a517352f8..aafcdd8ec38b 100644 --- a/eng/pipelines/templates/stages/python-analyze-weekly.yml +++ b/eng/pipelines/templates/stages/python-analyze-weekly.yml @@ -19,11 +19,14 @@ stages: timeoutInMinutes: 90 variables: - PythonVersion: '3.8' + - template: /eng/pipelines/templates/variables/image.yml + - name: PythonVersion + value: '3.8' pool: - name: azsdk-pool-mms-ubuntu-2004-general - vmImage: MMSUbuntu20.04 + name: $(LINUXPOOL) + vmImage: $(LINUXVMIMAGE) + os: linux steps: - task: UsePythonVersion@0 diff --git a/sdk/communication/azure-communication-phonenumbers/phonenumbers-livetest-matrix.json b/sdk/communication/azure-communication-phonenumbers/phonenumbers-livetest-matrix.json index 49064e5cc032..3a21c84b93ad 100644 --- a/sdk/communication/azure-communication-phonenumbers/phonenumbers-livetest-matrix.json +++ b/sdk/communication/azure-communication-phonenumbers/phonenumbers-livetest-matrix.json @@ -7,19 +7,19 @@ "matrix": { "Agent": { "ubuntu-20.04": { - "OSVmImage": "MMSUbuntu20.04", - "Pool": "azsdk-pool-mms-ubuntu-2004-general", + "OSVmImage": "env:LINUXVMIMAGE", + "Pool": "env:LINUXPOOL", "COMMUNICATION_SKIP_CAPABILITIES_LIVE_TEST": "true" }, "windows-2022": { - "OSVmImage": "MMS2022", - "Pool": "azsdk-pool-mms-win-2022-general", + "OSVmImage": "env:WINDOWSVMIMAGE", + "Pool": "env:WINDOWSPOOL", "AZURE_TEST_AGENT": "WINDOWS_2019_PYTHON36", "COMMUNICATION_SKIP_CAPABILITIES_LIVE_TEST": "false" }, "macos-11": { - "OSVmImage": "macos-11", - "Pool": "Azure Pipelines", + "OSVmImage": "env:MACVMIMAGE", + "Pool": "env:MACPOOL", "AZURE_TEST_AGENT": "MACOS_1015_PYTHON37", "COMMUNICATION_SKIP_CAPABILITIES_LIVE_TEST": "false" } @@ -32,8 +32,8 @@ { "CoverageConfig": { "ubuntu2004_39_coverage": { - "OSVmImage": "MMSUbuntu20.04", - "Pool": "azsdk-pool-mms-ubuntu-2004-general", + "OSVmImage": "env:LINUXVMIMAGE", + "Pool": "env:LINUXPOOL", "PythonVersion": "3.9", "CoverageArg": "", "TestSamples": "false", @@ -45,8 +45,8 @@ { "Config": { "Ubuntu2004_3120": { - "OSVmImage": "MMSUbuntu20.04", - "Pool": "azsdk-pool-mms-ubuntu-2004-general", + "OSVmImage": "env:LINUXVMIMAGE", + "Pool": "env:LINUXPOOL", "PythonVersion": "3.12", "CoverageArg": "--disablecov", "TestSamples": "false", diff --git a/sdk/cosmos/cosmos-emulator-matrix.json b/sdk/cosmos/cosmos-emulator-matrix.json index f6e22cd8d376..72daff0c3855 100644 --- a/sdk/cosmos/cosmos-emulator-matrix.json +++ b/sdk/cosmos/cosmos-emulator-matrix.json @@ -6,7 +6,7 @@ }, "matrix": { "Agent": { - "windows-2022": { "OSVmImage": "MMS2022", "Pool": "azsdk-pool-mms-win-2022-general" } + "windows-2022": { "OSVmImage": "env:WINDOWSVMIMAGE", "Pool": "env:WINDOWSPOOL" } }, "EmulatorConfig": { "Emulator Tests Python 3.8": { diff --git a/sdk/identity/platform-matrix-integration.json b/sdk/identity/platform-matrix-integration.json index 3f096b3c7b96..54959d7ab218 100644 --- a/sdk/identity/platform-matrix-integration.json +++ b/sdk/identity/platform-matrix-integration.json @@ -3,8 +3,8 @@ { "Agent": { "identity-integration": { - "OSVmImage": "MMSUbuntu20.04", - "Pool": "azsdk-pool-mms-ubuntu-2004-general", + "OSVmImage": "env:LINUXVMIMAGE", + "Pool": "env:LINUXPOOL", "ArmTemplateParameters": "@{ ProvisionLiveResources = $true }" } }, diff --git a/sdk/identity/platform-matrix.json b/sdk/identity/platform-matrix.json index cf9119ab271f..32243683c9c4 100644 --- a/sdk/identity/platform-matrix.json +++ b/sdk/identity/platform-matrix.json @@ -9,8 +9,8 @@ { "Config": { "ubuntu_20.04_3.8_msal": { - "OSVmImage": "MMSUbuntu20.04", - "Pool": "azsdk-pool-mms-ubuntu-2004-general", + "OSVmImage": "env:LINUXVMIMAGE", + "Pool": "env:LINUXPOOL", "PythonVersion": "3.8", "CoverageArg": "--disablecov", "InjectedPackages": "git+https://github.com/AzureAD/microsoft-authentication-library-for-python@dev", diff --git a/sdk/keyvault/azure-keyvault-keys/platform-matrix.json b/sdk/keyvault/azure-keyvault-keys/platform-matrix.json index 4a4601c5b693..7f0a01ac0315 100644 --- a/sdk/keyvault/azure-keyvault-keys/platform-matrix.json +++ b/sdk/keyvault/azure-keyvault-keys/platform-matrix.json @@ -3,8 +3,8 @@ { "Agent": { "ubuntu-20.04_ManagedHSM": { - "OSVmImage": "MMSUbuntu20.04", - "Pool": "azsdk-pool-mms-ubuntu-2004-general", + "OSVmImage": "env:LINUXVMIMAGE", + "Pool": "env:LINUXPOOL", "ArmTemplateParameters": "@{ enableHsm = $true }" } }, diff --git a/sdk/storage/platform-matrix-all-versions.json b/sdk/storage/platform-matrix-all-versions.json index 41bfe0869a02..3ffc9af1c078 100644 --- a/sdk/storage/platform-matrix-all-versions.json +++ b/sdk/storage/platform-matrix-all-versions.json @@ -6,9 +6,9 @@ }, "matrix": { "Agent": { - "Ubuntu-20.04": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" }, - "windows-2022": { "OSVmImage": "MMS2022", "Pool": "azsdk-pool-mms-win-2022-general" }, - "macos-11": { "OSVmImage": "macos-11", "Pool": "Azure Pipelines" } + "Ubuntu-20.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" }, + "windows-2022": { "OSVmImage": "env:WINDOWSVMIMAGE", "Pool": "env:WINDOWSPOOL" }, + "macos-11": { "OSVmImage": "env:MACVMIMAGE", "Pool": "env:MACPOOL" } }, "PythonVersion": [ "3.8", "3.9", "3.10", "3.11" ], "CoverageArg": "--disablecov", @@ -27,8 +27,8 @@ { "CoverageConfig": { "ubuntu2004_pypy39": { - "OSVmImage": "MMSUbuntu20.04", - "Pool": "azsdk-pool-mms-ubuntu-2004-general", + "OSVmImage": "env:LINUXVMIMAGE", + "Pool": "env:LINUXPOOL", "PythonVersion": "pypy3.9", "CoverageArg": "--disablecov", "TestSamples": "false"