Skip to content

Commit d7ae517

Browse files
[ci] Migrate ubuntu and sonicbld agent pool to fix S360 alert. (#19101)
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 a015cd9 commit d7ae517

11 files changed

+21
-21
lines changed

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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 2 additions & 2 deletions
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.yml

Lines changed: 1 addition & 1 deletion
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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ parameters:
2828
default: sonicdev
2929
- name: pool
3030
type: string
31-
default: sonicbld
31+
default: sonicbld-1es
3232
values:
33-
- sonicbld
33+
- sonicbld-1es
3434
- sonicbld-arm64
3535
- sonicbld-armhf
3636

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ stages:
6363
- ${{ each arch in parameters.arches }}:
6464
- template: .azure-pipelines/docker-sonic-slave-template.yml@buildimage
6565
parameters:
66-
pool: sonicbld
66+
pool: sonicbld-1es
6767
arch: ${{ arch }}
6868
dist: ${{ dist }}
6969
${{ if ne(arch, 'amd64') }}:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pr: none
1616

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

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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ variables:
4646

4747
stages:
4848
- stage: BuildVS
49-
pool: sonicbld
49+
pool: sonicbld-1es
5050
jobs:
5151
- template: .azure-pipelines/azure-pipelines-build.yml
5252
parameters:
@@ -55,7 +55,7 @@ stages:
5555
- name: vs
5656

5757
- stage: Build
58-
pool: sonicbld
58+
pool: sonicbld-1es
5959
variables:
6060
INSTALL_DEBUG_TOOLS: y
6161
dependsOn: []
@@ -149,7 +149,7 @@ stages:
149149
testRunTitle: vstest
150150

151151
- job: t0_elastictest
152-
pool: ubuntu-20.04
152+
pool: sonic-ubuntu-1c
153153
displayName: "kvmtest-t0 by Elastictest"
154154
timeoutInMinutes: 240
155155
continueOnError: false
@@ -162,7 +162,7 @@ stages:
162162
MGMT_BRANCH: "202305"
163163

164164
- job: t0_2vlans_elastictest
165-
pool: ubuntu-20.04
165+
pool: sonic-ubuntu-1c
166166
displayName: "kvmtest-t0-2vlans by Elastictest"
167167
timeoutInMinutes: 240
168168
continueOnError: false
@@ -177,7 +177,7 @@ stages:
177177
DEPLOY_MG_EXTRA_PARAMS: "-e vlan_config=two_vlan_a"
178178

179179
- job: t1_lag_elastictest
180-
pool: ubuntu-20.04
180+
pool: sonic-ubuntu-1c
181181
displayName: "kvmtest-t1-lag by Elastictest"
182182
timeoutInMinutes: 240
183183
continueOnError: false
@@ -191,7 +191,7 @@ stages:
191191

192192
- job: multi_asic_elastictest
193193
displayName: "kvmtest-multi-asic-t1-lag by Elastictest"
194-
pool: ubuntu-20.04
194+
pool: sonic-ubuntu-1c
195195
timeoutInMinutes: 240
196196
continueOnError: false
197197
steps:
@@ -205,7 +205,7 @@ stages:
205205
MGMT_BRANCH: "202305"
206206

207207
- job: dualtor_elastictest
208-
pool: ubuntu-20.04
208+
pool: sonic-ubuntu-1c
209209
displayName: "kvmtest-dualtor-t0 by Elastictest"
210210
timeoutInMinutes: 240
211211
continueOnError: false
@@ -220,7 +220,7 @@ stages:
220220

221221
- job: sonic_t0_elastictest
222222
displayName: "kvmtest-t0-sonic by Elastictest"
223-
pool: ubuntu-20.04
223+
pool: sonic-ubuntu-1c
224224
timeoutInMinutes: 240
225225
continueOnError: false
226226
steps:
@@ -236,7 +236,7 @@ stages:
236236

237237
# - job: wan_elastictest
238238
# displayName: "kvmtest-wan by Elastictest"
239-
# pool: ubuntu-20.04
239+
# pool: sonic-ubuntu-1c
240240
# timeoutInMinutes: 240
241241
# continueOnError: false
242242
# steps:

0 commit comments

Comments
 (0)