From cbbe278da275d9478fc1832e34d44dfc5360a765 Mon Sep 17 00:00:00 2001 From: shilongliu Date: Tue, 28 May 2024 18:53:34 +0800 Subject: [PATCH 1/5] [ci] Migrate ubuntu and sonicbld agent pool to fix S360 alert. --- azure-pipelines.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1500dd78757b..71c1ad4044f8 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -81,8 +81,8 @@ stages: PLATFORM_ARCH: armhf - stage: Test - dependsOn: BuildVS - condition: and(succeeded(), and(ne(stageDependencies.BuildVS.outputs['vs.SetVar.SKIP_VSTEST'], 'YES'), in(dependencies.BuildVS.result, 'Succeeded', 'SucceededWithIssues'))) +# dependsOn: BuildVS +# condition: and(succeeded(), and(ne(stageDependencies.BuildVS.outputs['vs.SetVar.SKIP_VSTEST'], 'YES'), in(dependencies.BuildVS.result, 'Succeeded', 'SucceededWithIssues'))) variables: - group: SONiC-Elastictest - name: inventory @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 From 457af5a417dfa116652545100f369c4a5bb10f8c Mon Sep 17 00:00:00 2001 From: shilongliu Date: Tue, 28 May 2024 18:58:26 +0800 Subject: [PATCH 2/5] fix --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 71c1ad4044f8..5a1bba9a6c04 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -81,7 +81,7 @@ stages: PLATFORM_ARCH: armhf - stage: Test -# dependsOn: BuildVS + dependsOn: [] #BuildVS # condition: and(succeeded(), and(ne(stageDependencies.BuildVS.outputs['vs.SetVar.SKIP_VSTEST'], 'YES'), in(dependencies.BuildVS.result, 'Succeeded', 'SucceededWithIssues'))) variables: - group: SONiC-Elastictest From 616a3aff561b1c7be2a6516cb120c58a124dd955 Mon Sep 17 00:00:00 2001 From: shilongliu Date: Tue, 28 May 2024 21:07:27 +0800 Subject: [PATCH 3/5] fix --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5a1bba9a6c04..4ad4c67811ad 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -81,8 +81,8 @@ stages: PLATFORM_ARCH: armhf - stage: Test - dependsOn: [] #BuildVS -# condition: and(succeeded(), and(ne(stageDependencies.BuildVS.outputs['vs.SetVar.SKIP_VSTEST'], 'YES'), in(dependencies.BuildVS.result, 'Succeeded', 'SucceededWithIssues'))) + dependsOn: BuildVS + condition: and(succeeded(), and(ne(stageDependencies.BuildVS.outputs['vs.SetVar.SKIP_VSTEST'], 'YES'), in(dependencies.BuildVS.result, 'Succeeded', 'SucceededWithIssues'))) variables: - group: SONiC-Elastictest - name: inventory From 83905ed769fe97fa10cf76f5b1c45889b59c92f8 Mon Sep 17 00:00:00 2001 From: shilongliu Date: Tue, 28 May 2024 21:06:42 +0800 Subject: [PATCH 4/5] fix --- .azure-pipelines/official-build-multi-asic.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines/official-build-multi-asic.yml b/.azure-pipelines/official-build-multi-asic.yml index 8fe0be32db10..518c87a184e1 100644 --- a/.azure-pipelines/official-build-multi-asic.yml +++ b/.azure-pipelines/official-build-multi-asic.yml @@ -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 From 69057df98e43e997cd295616cd86ea89d0da04b2 Mon Sep 17 00:00:00 2001 From: shilongliu Date: Tue, 28 May 2024 17:10:15 +0800 Subject: [PATCH 5/5] fix --- .azure-pipelines/azure-pipelines-Official.yml | 2 +- .azure-pipelines/azure-pipelines-UpgrateVersion.yml | 2 +- .azure-pipelines/build-template.yml | 4 ++-- .azure-pipelines/docker-sonic-slave-template.yml | 4 ++-- .azure-pipelines/docker-sonic-slave.yml | 2 +- .azure-pipelines/dpkg-cache-cleanup.yml | 2 +- .azure-pipelines/official-build-cache.yml | 2 +- .azure-pipelines/official-build.yml | 2 +- .azure-pipelines/template-commonlib.yml | 2 +- azure-pipelines.yml | 4 ++-- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-Official.yml b/.azure-pipelines/azure-pipelines-Official.yml index a5a08167ca1d..56d88751f690 100644 --- a/.azure-pipelines/azure-pipelines-Official.yml +++ b/.azure-pipelines/azure-pipelines-Official.yml @@ -14,7 +14,7 @@ schedules: - 202012 always: true -pool: sonicbld +pool: sonicbld-1es stages: - stage: Build diff --git a/.azure-pipelines/azure-pipelines-UpgrateVersion.yml b/.azure-pipelines/azure-pipelines-UpgrateVersion.yml index 1d2a0fbae6dc..a6946f745e76 100644 --- a/.azure-pipelines/azure-pipelines-UpgrateVersion.yml +++ b/.azure-pipelines/azure-pipelines-UpgrateVersion.yml @@ -26,7 +26,7 @@ resources: ref: master endpoint: sonic-net -pool: sonicbld +pool: sonicbld-1es parameters: - name: 'jobFilters' diff --git a/.azure-pipelines/build-template.yml b/.azure-pipelines/build-template.yml index 48bc3293b964..487e67296a0c 100644 --- a/.azure-pipelines/build-template.yml +++ b/.azure-pipelines/build-template.yml @@ -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 diff --git a/.azure-pipelines/docker-sonic-slave-template.yml b/.azure-pipelines/docker-sonic-slave-template.yml index 828f958e5ed2..fe4f87e71b7b 100644 --- a/.azure-pipelines/docker-sonic-slave-template.yml +++ b/.azure-pipelines/docker-sonic-slave-template.yml @@ -28,9 +28,9 @@ parameters: default: sonicdev - name: pool type: string - default: sonicbld + default: sonicbld-1es values: - - sonicbld + - sonicbld-1es - sonicbld-arm64 - sonicbld-armhf diff --git a/.azure-pipelines/docker-sonic-slave.yml b/.azure-pipelines/docker-sonic-slave.yml index 4c679f7f9518..332d6c4932ad 100644 --- a/.azure-pipelines/docker-sonic-slave.yml +++ b/.azure-pipelines/docker-sonic-slave.yml @@ -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') }}: diff --git a/.azure-pipelines/dpkg-cache-cleanup.yml b/.azure-pipelines/dpkg-cache-cleanup.yml index 2789d1818819..52b0e866a6c7 100644 --- a/.azure-pipelines/dpkg-cache-cleanup.yml +++ b/.azure-pipelines/dpkg-cache-cleanup.yml @@ -16,7 +16,7 @@ pr: none jobs: - job: Build - pool: sonicbld + pool: sonicbld-1es timeoutInMinutes: 5 steps: - checkout: none diff --git a/.azure-pipelines/official-build-cache.yml b/.azure-pipelines/official-build-cache.yml index 94fd48ede501..8e861d0a6020 100644 --- a/.azure-pipelines/official-build-cache.yml +++ b/.azure-pipelines/official-build-cache.yml @@ -16,7 +16,7 @@ pr: none stages: - stage: Build - pool: sonicbld + pool: sonicbld-1es variables: - name: CACHE_MODE value: cache diff --git a/.azure-pipelines/official-build.yml b/.azure-pipelines/official-build.yml index 049935940bd6..95839e14b33f 100644 --- a/.azure-pipelines/official-build.yml +++ b/.azure-pipelines/official-build.yml @@ -34,7 +34,7 @@ variables: stages: - stage: Build - pool: sonicbld + pool: sonicbld-1es variables: - name: CACHE_MODE value: wcache diff --git a/.azure-pipelines/template-commonlib.yml b/.azure-pipelines/template-commonlib.yml index cd7551d83823..c821998ae815 100644 --- a/.azure-pipelines/template-commonlib.yml +++ b/.azure-pipelines/template-commonlib.yml @@ -11,7 +11,7 @@ jobs: - job: Build_${{ arch }} timeoutInMinutes: 120 ${{ if eq(arch,'amd64') }}: - pool: sonicbld + pool: sonicbld-1es ${{ else }}: pool: sonicbld-${{ arch }} variables: diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 4ad4c67811ad..1d14ef132616 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -47,7 +47,7 @@ variables: stages: - stage: BuildVS - pool: sonicbld + pool: sonicbld-1es jobs: - template: .azure-pipelines/azure-pipelines-build.yml parameters: @@ -56,7 +56,7 @@ stages: - name: vs - stage: Build - pool: sonicbld + pool: sonicbld-1es dependsOn: [] jobs: - template: .azure-pipelines/azure-pipelines-build.yml