@@ -18,10 +18,15 @@ resources:
1818 name : Azure/azure-sdk-tools
1919
2020variables :
21- PythonVersion : " 3.12"
22- AUTOREST_TESTSERVER_COVERAGE_DIRECTORY : " $(Build.SourcesDirectory)/autorest.python/packages/autorest.python/coverage/"
23- PROXY_URL : http://localhost:5000
24- PROXY_MANUAL_START : true
21+ - template : /eng/pipelines/templates/variables/image.yml
22+ - name : PythonVersion
23+ value : " 3.12"
24+ - name : AUTOREST_TESTSERVER_COVERAGE_DIRECTORY
25+ value : " $(Build.SourcesDirectory)/autorest.python/packages/autorest.python/coverage/"
26+ - name : PROXY_URL
27+ value : http://localhost:5000
28+ - name : PROXY_MANUAL_START
29+ value : true
2530
2631parameters :
2732 - name : VerificationPackages
@@ -46,32 +51,40 @@ jobs:
4651 matrix :
4752 Linux_Python3.9 :
4853 OSName : " Linux"
49- OSVmImage : " MMSUbuntu18.04"
54+ Pool : ${{ variables.LINUXPOOL }}
55+ OSVmImage : ${{ variables.LINUXVMIMAGE}}
5056 PythonVersion : " 3.9"
5157 Windows_Python3.9 :
5258 OSName : " Windows"
53- OSVmImage : " MMS2020"
54- PythonVersion : " 3.9"
59+ # TODO: Update to WINDOWSPOOL and WINDOWSVMIMAGE once tests pass
60+ Pool : ${{ variables.LINUXPOOL }}
61+ OSVmImage : ${{ variables.LINUXVMIMAGE}}
62+ PythonVersion : " 3.9"
5563 Linux_Python3.10 :
5664 OSName : " Linux"
57- OSVmImage : " MMSUbuntu20.04"
65+ Pool : ${{ variables.LINUXPOOL }}
66+ OSVmImage : ${{ variables.LINUXVMIMAGE}}
5867 PythonVersion : " 3.10"
5968 Linux_Python3.11 :
6069 OSName : " Linux"
61- OSVmImage : " MMSUbuntu22.04"
70+ Pool : ${{ variables.LINUXPOOL }}
71+ OSVmImage : ${{ variables.LINUXVMIMAGE}}
6272 PythonVersion : " 3.11"
6373 Linux_Python3.12 :
6474 OSName : " Linux"
65- OSVmImage : " MMSUbuntu22.04"
75+ Pool : ${{ variables.LINUXPOOL }}
76+ OSVmImage : ${{ variables.LINUXVMIMAGE}}
6677 PythonVersion : " 3.12"
6778 Windows_Python3.12 :
6879 OSName : " Windows"
69- OSVmImage : " MMS2023"
80+ # TODO: Update to WINDOWSPOOL and WINDOWSVMIMAGE once tests pass
81+ Pool : ${{ variables.LINUXPOOL }}
82+ OSVmImage : ${{ variables.LINUXVMIMAGE}}
7083 PythonVersion : " 3.12"
7184
7285 pool :
73- name : azsdk-pool-mms-ubuntu-2004-general
74- vmImage : $(OSVmImage)
86+ name : $(Pool)
87+ demands : ImageOverride -equals $(OSVmImage)
7588
7689 steps :
7790 - template : ci-template.yml
@@ -139,32 +152,40 @@ jobs:
139152 matrix :
140153 Linux_Python3.9 :
141154 OSName : " Linux"
142- OSVmImage : " MMSUbuntu18.04"
155+ Pool : ${{ variables.LINUXPOOL }}
156+ OSVmImage : ${{ variables.LINUXVMIMAGE}}
143157 PythonVersion : " 3.9"
144158 Windows_Python3.9 :
145159 OSName : " Windows"
146- OSVmImage : " MMS2020"
160+ # TODO: Update to WINDOWSPOOL and WINDOWSVMIMAGE once tests pass
161+ Pool : ${{ variables.LINUXPOOL }}
162+ OSVmImage : ${{ variables.LINUXVMIMAGE}}
147163 PythonVersion : " 3.9"
148164 Linux_Python310 :
149165 OSName : " Linux"
150- OSVmImage : " MMSUbuntu20.04"
166+ Pool : ${{ variables.LINUXPOOL }}
167+ OSVmImage : ${{ variables.LINUXVMIMAGE}}
151168 PythonVersion : " 3.10"
152169 Linux_Python311 :
153170 OSName : " Linux"
154- OSVmImage : " MMSUbuntu22.04"
171+ Pool : ${{ variables.LINUXPOOL }}
172+ OSVmImage : ${{ variables.LINUXVMIMAGE}}
155173 PythonVersion : " 3.11"
156174 Linux_Python312 :
157175 OSName : " Linux"
158- OSVmImage : " MMSUbuntu22.04"
176+ Pool : ${{ variables.LINUXPOOL }}
177+ OSVmImage : ${{ variables.LINUXVMIMAGE}}
159178 PythonVersion : " 3.12"
160179 Windows_Python312 :
161180 OSName : " Windows"
162- OSVmImage : " MMS2023"
181+ # TODO: Update to WINDOWSPOOL and WINDOWSVMIMAGE once tests pass
182+ Pool : ${{ variables.LINUXPOOL }}
183+ OSVmImage : ${{ variables.LINUXVMIMAGE}}
163184 PythonVersion : " 3.12"
164185
165186 pool :
166- name : azsdk-pool-mms-ubuntu-2004-general
167- vmImage : $(OSVmImage)
187+ name : $(Pool)
188+ demands : ImageOverride -equals $(OSVmImage)
168189
169190 steps :
170191 - template : ci-template.yml
0 commit comments