Skip to content

Commit 42b5dfa

Browse files
authored
more updates to various image references (#34692)
1 parent 54343c4 commit 42b5dfa

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

eng/pipelines/templates/stages/platform-matrix-excluding-pypy.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
},
77
"matrix": {
88
"Agent": {
9-
"windows-2022": { "OSVmImage": "MMS2022", "Pool": "azsdk-pool-mms-win-2022-general" },
10-
"ubuntu-20.04": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" },
11-
"macos-11": { "OSVmImage": "macos-11", "Pool": "Azure Pipelines" }
9+
"windows-2022": { "OSVmImage": "env:WINDOWSVMIMAGE", "Pool": "env:WINDOWSPOOL" },
10+
"ubuntu-20.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" },
11+
"macos-11": { "OSVmImage": "env:MACVMIMAGE", "Pool": "env:MACPOOL" }
1212
},
1313
"PythonVersion": [ "3.9", "3.8", "3.11", "3.10" ],
1414
"CoverageArg": "--disablecov",
@@ -18,8 +18,8 @@
1818
{
1919
"CoverageConfig": {
2020
"ubuntu2004_39_coverage": {
21-
"OSVmImage": "MMSUbuntu20.04",
22-
"Pool": "azsdk-pool-mms-ubuntu-2004-general",
21+
"OSVmImage": "env:LINUXVMIMAGE",
22+
"Pool": "env:LINUXPOOL",
2323
"PythonVersion": "3.9",
2424
"CoverageArg": "",
2525
"TestSamples": "false"
@@ -29,8 +29,8 @@
2929
{
3030
"Config": {
3131
"Ubuntu2004_3120": {
32-
"OSVmImage": "MMSUbuntu20.04",
33-
"Pool": "azsdk-pool-mms-ubuntu-2004-general",
32+
"OSVmImage": "env:LINUXVMIMAGE",
33+
"Pool": "env:LINUXPOOL",
3434
"PythonVersion": "3.12",
3535
"CoverageArg": "--disablecov",
3636
"TestSamples": "false"

eng/pipelines/templates/stages/platform-matrix-no-312.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
},
77
"matrix": {
88
"Agent": {
9-
"windows-2022": { "OSVmImage": "MMS2022", "Pool": "azsdk-pool-mms-win-2022-general" },
10-
"ubuntu-20.04": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" },
11-
"macos-11": { "OSVmImage": "macos-11", "Pool": "Azure Pipelines" }
9+
"windows-2022": { "OSVmImage": "env:WINDOWSVMIMAGE", "Pool": "env:WINDOWSPOOL" },
10+
"ubuntu-20.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" },
11+
"macos-11": { "OSVmImage": "env:MACVMIMAGE", "Pool": "env:MACPOOL" }
1212
},
1313
"PythonVersion": [ "pypy3.9", "3.8", "3.10", "3.11" ],
1414
"CoverageArg": "--disablecov",
@@ -18,8 +18,8 @@
1818
{
1919
"CoverageConfig": {
2020
"ubuntu2004_39_coverage": {
21-
"OSVmImage": "MMSUbuntu20.04",
22-
"Pool": "azsdk-pool-mms-ubuntu-2004-general",
21+
"OSVmImage": "env:LINUXVMIMAGE",
22+
"Pool": "env:LINUXPOOL",
2323
"PythonVersion": "3.9",
2424
"CoverageArg": "",
2525
"TestSamples": "false"

eng/pipelines/templates/stages/regression-job-matrix.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"matrix": {
33
"Agent": {
44
"ubuntu-20.04": {
5-
"OSVmImage": "azsdk-pool-mms-ubuntu-2004-1espt",
5+
"OSVmImage": "env:LINUXVMIMAGE",
66
"Pool": "env:LINUXPOOL",
77
"os": "linux"
88
}

0 commit comments

Comments
 (0)