Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ci] Migrate ubuntu and sonicbld agent pool to fix S360 alert. #19102

Merged
merged 5 commits into from
May 30, 2024
Merged

[ci] Migrate ubuntu and sonicbld agent pool to fix S360 alert. #19102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cbbe278
[ci] Migrate ubuntu and sonicbld agent pool to fix S360 alert.
liushilongbuaa May 28, 2024
457af5a
fix
liushilongbuaa May 28, 2024
616a3af
fix
liushilongbuaa May 28, 2024
83905ed
fix
liushilongbuaa May 28, 2024
69057df
fix
liushilongbuaa May 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-Official.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ schedules:
- 202012
always: true

pool: sonicbld
pool: sonicbld-1es

stages:
- stage: Build
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-UpgrateVersion.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ resources:
ref: master
endpoint: sonic-net

pool: sonicbld
pool: sonicbld-1es

parameters:
- name: 'jobFilters'
Expand Down
4 changes: 2 additions & 2 deletions .azure-pipelines/build-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ parameters:
- name: pool
type: string
values:
- sonicbld
- sonicbld-1es
- sonicbld_8c
default: sonicbld
default: sonicbld-1es

- name: dbg_image
type: boolean
Expand Down
4 changes: 2 additions & 2 deletions .azure-pipelines/docker-sonic-slave-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ parameters:
default: sonicdev
- name: pool
type: string
default: sonicbld
default: sonicbld-1es
values:
- sonicbld
- sonicbld-1es
- sonicbld-arm64
- sonicbld-armhf

Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines/docker-sonic-slave.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ stages:
- ${{ each arch in parameters.arches }}:
- template: .azure-pipelines/docker-sonic-slave-template.yml@buildimage
parameters:
pool: sonicbld
pool: sonicbld-1es
arch: ${{ arch }}
dist: ${{ dist }}
${{ if ne(arch, 'amd64') }}:
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines/dpkg-cache-cleanup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ pr: none

jobs:
- job: Build
pool: sonicbld
pool: sonicbld-1es
timeoutInMinutes: 5
steps:
- checkout: none
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines/official-build-cache.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ pr: none

stages:
- stage: Build
pool: sonicbld
pool: sonicbld-1es
variables:
- name: CACHE_MODE
value: cache
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines/official-build-multi-asic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ pr: none

stages:
- stage: Build
pool: sonicbld
pool: sonicbld-1es
variables:
- template: azure-pipelines-repd-build-variables.yml
- name: CACHE_MODE
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines/official-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ variables:

stages:
- stage: Build
pool: sonicbld
pool: sonicbld-1es
variables:
- name: CACHE_MODE
value: wcache
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines/template-commonlib.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- job: Build_${{ arch }}
timeoutInMinutes: 120
${{ if eq(arch,'amd64') }}:
pool: sonicbld
pool: sonicbld-1es
${{ else }}:
pool: sonicbld-${{ arch }}
variables:
Expand Down
16 changes: 8 additions & 8 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ variables:

stages:
- stage: BuildVS
pool: sonicbld
pool: sonicbld-1es
jobs:
- template: .azure-pipelines/azure-pipelines-build.yml
parameters:
Expand All @@ -56,7 +56,7 @@ stages:
- name: vs

- stage: Build
pool: sonicbld
pool: sonicbld-1es
dependsOn: []
jobs:
- template: .azure-pipelines/azure-pipelines-build.yml
Expand Down Expand Up @@ -141,7 +141,7 @@ stages:
testRunTitle: vstest

- job: t0_elastictest
pool: ubuntu-20.04
pool: sonic-ubuntu-1c
displayName: "kvmtest-t0 by Elastictest"
timeoutInMinutes: 240
continueOnError: false
Expand All @@ -154,7 +154,7 @@ stages:
MGMT_BRANCH: "202205"

- job: t0_2vlans_elastictest
pool: ubuntu-20.04
pool: sonic-ubuntu-1c
displayName: "kvmtest-t0-2vlans by Elastictest"
timeoutInMinutes: 240
continueOnError: false
Expand All @@ -169,7 +169,7 @@ stages:
MGMT_BRANCH: "202205"

- job: t1_lag_elastictest
pool: ubuntu-20.04
pool: sonic-ubuntu-1c
displayName: "kvmtest-t1-lag by Elastictest"
timeoutInMinutes: 240
continueOnError: false
Expand All @@ -182,7 +182,7 @@ stages:
MGMT_BRANCH: "202205"

- job: sonic_t0_elastictest
pool: ubuntu-20.04
pool: sonic-ubuntu-1c
displayName: "kvmtest-t0-sonic by Elastictest"
timeoutInMinutes: 240
continueOnError: false
Expand All @@ -198,7 +198,7 @@ stages:
MGMT_BRANCH: "202205"

- job: dualtor_elastictest
pool: ubuntu-20.04
pool: sonic-ubuntu-1c
displayName: "kvmtest-dualtor-t0 by Elastictest"
timeoutInMinutes: 240
continueOnError: false
Expand All @@ -212,7 +212,7 @@ stages:
MGMT_BRANCH: "202205"

- job: multi_asic_elastictest
pool: ubuntu-20.04
pool: sonic-ubuntu-1c
displayName: "kvmtest-multi-asic-t1-lag by Elastictest"
timeoutInMinutes: 1080
continueOnError: false
Expand Down
Loading