Skip to content

Commit 096c65b

Browse files
committed
convert conda to run on 1espt images
1 parent 8444ac1 commit 096c65b

File tree

3 files changed

+776
-737
lines changed

3 files changed

+776
-737
lines changed

eng/pipelines/templates/jobs/build-conda-dependencies.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ jobs:
99
timeoutInMinutes: 90
1010
pool:
1111
name: azsdk-pool-mms-win-2022-general
12-
vmImage: MMS2022
12+
vmImage: azsdk-pool-mms-win-2022-1espt
13+
os: windows
1314
variables:
1415
VS_INSTALLER_URL: "https://aka.ms/vs/17/release/vs_enterprise.exe"
1516
VS_INSTALLER_PATH: "$(Build.BinariesDirectory)/vs_enterprise.exe"
@@ -84,7 +85,9 @@ jobs:
8485
timeoutInMinutes: 90
8586
pool:
8687
name: azsdk-pool-mms-ubuntu-2004-general
87-
vmImage: MMSUbuntu20.04
88+
image: azsdk-pool-mms-ubuntu-2004-1espt
89+
os: linux
90+
8891
steps:
8992
- bash: |
9093
sudo apt-get install -y build-essential
@@ -101,6 +104,7 @@ jobs:
101104
pool:
102105
name: Azure Pipelines
103106
vmImage: macos-11
107+
os: macOS
104108
variables:
105109
MacOSXDeploymentTarget: '10.9'
106110
OpenSSLDir: $(Agent.BuildDirectory)/openssl-macosx$(MacOSXDeploymentTarget)

eng/pipelines/templates/jobs/smoke.tests.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484

8585
pool:
8686
name: $(Pool)
87-
vmImage: $(OSVmImage)
87+
image: $(OSVmImage)
8888
os: linux
8989

9090
variables:
@@ -107,7 +107,6 @@ jobs:
107107
- template: /eng/pipelines/templates/steps/smoke-test-steps.yml
108108

109109

110-
111110
- job: run_smoke_test_windows
112111
displayName: Run Smoke Test Windows
113112
${{ if eq(parameters.Daily, false) }}:
@@ -143,7 +142,7 @@ jobs:
143142
ArmTemplateParameters: $(azureChinaCloudArmParameters)
144143
pool:
145144
name: $(Pool)
146-
image: azsdk-pool-mms-win-2022-1espt
145+
image: $(OSVmImage)
147146
os: windows
148147

149148
variables:

0 commit comments

Comments
 (0)