Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remaining livetest matrices, ci.yml uses image.yml variables #34727

Merged
merged 4 commits into from
Mar 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .vscode/cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -454,6 +454,9 @@
"amltemp",
"deserializers",
"dicom",
"WINDOWSVMIMAGE",
"LINUXVMIMAGE",
"MACVMIMAGE"
],
"overrides": [
{
Expand Down
28 changes: 14 additions & 14 deletions eng/pipelines/templates/jobs/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -135,8 +135,8 @@ jobs:
timeoutInMinutes: 90

pool:
name: 'Azure Pipelines'
vmImage: macos-11
name: $(MACPOOL)
vmImage: $(MACVMIMAGE)
os: macOS

steps:
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand Down
1 change: 1 addition & 0 deletions eng/pipelines/templates/jobs/live.tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ jobs:

variables:
- template: ../variables/globals.yml
- template: ../variables/image.yml

- name: skipComponentGovernanceDetection
value: true
Expand Down
1 change: 1 addition & 0 deletions eng/pipelines/templates/stages/archetype-sdk-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'))}}:
Expand Down
10 changes: 5 additions & 5 deletions eng/pipelines/templates/stages/platform-matrix-ai.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
Expand Down
9 changes: 6 additions & 3 deletions eng/pipelines/templates/stages/python-analyze-weekly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand All @@ -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",
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion sdk/cosmos/cosmos-emulator-matrix.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
4 changes: 2 additions & 2 deletions sdk/identity/platform-matrix-integration.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 }"
}
},
Expand Down
4 changes: 2 additions & 2 deletions sdk/identity/platform-matrix.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions sdk/keyvault/azure-keyvault-keys/platform-matrix.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 }"
}
},
Expand Down
10 changes: 5 additions & 5 deletions sdk/storage/platform-matrix-all-versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
Expand Down