Skip to content

Commit 1af02ca

Browse files
[ci] Migrate ubuntu and sonicbld agent pool to fix S360 alert. (sonic-net#19099)
Why I did it Migrate agent pool to fix S360 ticket. Work item tracking Microsoft ADO (number only): 27889786 How I did it How to verify it
1 parent 27473fa commit 1af02ca

12 files changed

+24
-24
lines changed

.azure-pipelines/azure-pipelines-Official.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ schedules:
1414
- 202012
1515
always: true
1616

17-
pool: sonicbld
17+
pool: sonicbld-1es
1818

1919
stages:
2020
- stage: Build

.azure-pipelines/azure-pipelines-UpgrateVersion.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ resources:
2626
ref: master
2727
endpoint: sonic-net
2828

29-
pool: sonicbld
29+
pool: sonicbld-1es
3030

3131
parameters:
3232
- name: 'jobFilters'

.azure-pipelines/build-template.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ parameters:
3535
- name: pool
3636
type: string
3737
values:
38-
- sonicbld
38+
- sonicbld-1es
3939
- sonicbld_8c
40-
default: sonicbld
40+
default: sonicbld-1es
4141

4242
- name: dbg_image
4343
type: boolean

.azure-pipelines/docker-sonic-mgmt-py3-only.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ stages:
3232
- stage: Build
3333
jobs:
3434
- job: Build
35-
pool: sonicbld
35+
pool: sonicbld-1es
3636
timeoutInMinutes: 360
3737
steps:
3838
- template: cleanup.yml

.azure-pipelines/docker-sonic-mgmt.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ stages:
3232
- stage: Build
3333
jobs:
3434
- job: Build
35-
pool: sonicbld
35+
pool: sonicbld-1es
3636
timeoutInMinutes: 360
3737
steps:
3838
- template: cleanup.yml

.azure-pipelines/docker-sonic-slave-template.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ parameters:
2929
default: sonicdev
3030
- name: pool
3131
type: string
32-
default: sonicbld
32+
default: sonicbld-1es
3333
values:
34-
- sonicbld
34+
- sonicbld-1es
3535
- sonicbld-arm64
3636
- sonicbld-armhf
3737

.azure-pipelines/docker-sonic-slave.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ stages:
6464
- ${{ each arch in parameters.arches }}:
6565
- template: .azure-pipelines/docker-sonic-slave-template.yml@buildimage
6666
parameters:
67-
pool: sonicbld
67+
pool: sonicbld-1es
6868
arch: ${{ arch }}
6969
dist: ${{ dist }}
7070
${{ if ne(arch, 'amd64') }}:

.azure-pipelines/dpkg-cache-cleanup.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pr: none
1616

1717
jobs:
1818
- job: Amd
19-
pool: sonicbld
19+
pool: sonicbld-1es
2020
timeoutInMinutes: 5
2121
steps:
2222
- checkout: none

.azure-pipelines/official-build-cache.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pr: none
2424

2525
stages:
2626
- stage: Build
27-
pool: sonicbld
27+
pool: sonicbld-1es
2828
variables:
2929
- name: CACHE_MODE
3030
value: cache

.azure-pipelines/official-build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ variables:
3434

3535
stages:
3636
- stage: Build
37-
pool: sonicbld
37+
pool: sonicbld-1es
3838
variables:
3939
- name: CACHE_MODE
4040
value: wcache

.azure-pipelines/template-commonlib.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- job: Build_${{ arch }}
1212
timeoutInMinutes: 120
1313
${{ if eq(arch,'amd64') }}:
14-
pool: sonicbld
14+
pool: sonicbld-1es
1515
${{ else }}:
1616
pool: sonicbld-${{ arch }}
1717
variables:

azure-pipelines.yml

+11-11
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ variables:
5151

5252
stages:
5353
- stage: BuildVS
54-
pool: sonicbld
54+
pool: sonicbld-1es
5555
jobs:
5656
- template: .azure-pipelines/azure-pipelines-build.yml
5757
parameters:
@@ -60,7 +60,7 @@ stages:
6060
- name: vs
6161

6262
- stage: Build
63-
pool: sonicbld
63+
pool: sonicbld-1es
6464
dependsOn: []
6565
jobs:
6666
- template: .azure-pipelines/azure-pipelines-build.yml
@@ -163,7 +163,7 @@ stages:
163163
testRunTitle: vstest
164164

165165
- job: t0_elastictest
166-
pool: ubuntu-20.04
166+
pool: sonic-ubuntu-1c
167167
displayName: "kvmtest-t0 by Elastictest"
168168
timeoutInMinutes: 240
169169
continueOnError: false
@@ -176,7 +176,7 @@ stages:
176176
MGMT_BRANCH: $(BUILD_BRANCH)
177177

178178
- job: t0_2vlans_elastictest
179-
pool: ubuntu-20.04
179+
pool: sonic-ubuntu-1c
180180
displayName: "kvmtest-t0-2vlans by Elastictest"
181181
timeoutInMinutes: 240
182182
continueOnError: false
@@ -191,7 +191,7 @@ stages:
191191
DEPLOY_MG_EXTRA_PARAMS: "-e vlan_config=two_vlan_a"
192192

193193
- job: t1_lag_elastictest
194-
pool: ubuntu-20.04
194+
pool: sonic-ubuntu-1c
195195
displayName: "kvmtest-t1-lag by Elastictest"
196196
timeoutInMinutes: 240
197197
continueOnError: false
@@ -205,7 +205,7 @@ stages:
205205

206206
- job: multi_asic_elastictest
207207
displayName: "kvmtest-multi-asic-t1-lag by Elastictest"
208-
pool: ubuntu-20.04
208+
pool: sonic-ubuntu-1c
209209
timeoutInMinutes: 240
210210
continueOnError: false
211211
steps:
@@ -219,7 +219,7 @@ stages:
219219
MGMT_BRANCH: $(BUILD_BRANCH)
220220

221221
- job: dualtor_elastictest
222-
pool: ubuntu-20.04
222+
pool: sonic-ubuntu-1c
223223
displayName: "kvmtest-dualtor-t0 by Elastictest"
224224
timeoutInMinutes: 240
225225
continueOnError: false
@@ -234,7 +234,7 @@ stages:
234234

235235
- job: sonic_t0_elastictest
236236
displayName: "kvmtest-t0-sonic by Elastictest"
237-
pool: ubuntu-20.04
237+
pool: sonic-ubuntu-1c
238238
timeoutInMinutes: 240
239239
continueOnError: false
240240
steps:
@@ -252,7 +252,7 @@ stages:
252252
displayName: "kvmtest-dpu by Elastictest"
253253
timeoutInMinutes: 240
254254
continueOnError: false
255-
pool: ubuntu-20.04
255+
pool: sonic-ubuntu-1c
256256
steps:
257257
- template: .azure-pipelines/run-test-elastictest-template.yml@sonic-mgmt
258258
parameters:
@@ -265,7 +265,7 @@ stages:
265265
displayName: "onboarding testcases by Elastictest"
266266
timeoutInMinutes: 240
267267
continueOnError: true
268-
pool: ubuntu-20.04
268+
pool: sonic-ubuntu-1c
269269
steps:
270270
- template: .azure-pipelines/run-test-elastictest-template.yml@sonic-mgmt
271271
parameters:
@@ -279,7 +279,7 @@ stages:
279279

280280
# - job: wan_elastictest
281281
# displayName: "kvmtest-wan by Elastictest"
282-
# pool: ubuntu-20.04
282+
# pool: sonic-ubuntu-1c
283283
# timeoutInMinutes: 240
284284
# continueOnError: false
285285
# steps:

0 commit comments

Comments
 (0)