From 58cd24ab2915d3af96543b6378fc6b0042567919 Mon Sep 17 00:00:00 2001 From: yijingyan2 Date: Wed, 12 Nov 2025 05:26:37 +0000 Subject: [PATCH 1/3] Migrate agent pool from sonicbld-1es to sonicso1ES-amd64 Signed-off-by: yijingyan2 --- .azure-pipelines/build-template.yml | 6 +++--- .azure-pipelines/gcov.yml | 2 +- azure-pipelines.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.azure-pipelines/build-template.yml b/.azure-pipelines/build-template.yml index 3efa80dccc..5a9e918289 100644 --- a/.azure-pipelines/build-template.yml +++ b/.azure-pipelines/build-template.yml @@ -10,9 +10,9 @@ parameters: - name: pool type: string values: - - sonicbld-1es - - sonicbld-armhf - - sonicbld-arm64 + - sonicso1ES-amd64 + - sonicso1ES-armhf + - sonicso1ES-arm64 - default default: default diff --git a/.azure-pipelines/gcov.yml b/.azure-pipelines/gcov.yml index 2dc193c2e7..b28aa238ad 100644 --- a/.azure-pipelines/gcov.yml +++ b/.azure-pipelines/gcov.yml @@ -8,7 +8,7 @@ parameters: - name: pool type: string values: - - sonicbld-1es + - sonicso1ES-amd64 - default default: default diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 362a106225..1a19bd3758 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -70,7 +70,7 @@ stages: parameters: arch: armhf timeout: 240 - pool: sonicbld-armhf + pool: sonicso1ES-armhf sonic_slave: sonic-slave-bullseye-armhf common_lib_artifact_name: common-lib.armhf swss_common_artifact_name: sonic-swss-common.armhf @@ -82,7 +82,7 @@ stages: parameters: arch: arm64 timeout: 240 - pool: sonicbld-arm64 + pool: sonicso1ES-arm64 sonic_slave: sonic-slave-bullseye-arm64 common_lib_artifact_name: common-lib.arm64 swss_common_artifact_name: sonic-swss-common.arm64 From e76370ed0d9de4c0b198a92ed410f6c02ca5e2e1 Mon Sep 17 00:00:00 2001 From: yijingyan2 Date: Wed, 12 Nov 2025 22:47:06 +0000 Subject: [PATCH 2/3] update image to ubuntu-24.04 Signed-off-by: yijingyan2 --- .azure-pipelines/build-docker-sonic-vs-template.yml | 2 +- .azure-pipelines/build-template.yml | 2 +- .azure-pipelines/gcov.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.azure-pipelines/build-docker-sonic-vs-template.yml b/.azure-pipelines/build-docker-sonic-vs-template.yml index 32ac65aa14..68a1cb9af3 100644 --- a/.azure-pipelines/build-docker-sonic-vs-template.yml +++ b/.azure-pipelines/build-docker-sonic-vs-template.yml @@ -69,7 +69,7 @@ jobs: timeoutInMinutes: ${{ parameters.timeout }} pool: - vmImage: 'ubuntu-20.04' + vmImage: 'ubuntu-24.04' steps: - task: DownloadPipelineArtifact@2 diff --git a/.azure-pipelines/build-template.yml b/.azure-pipelines/build-template.yml index 5a9e918289..e0bcf5076c 100644 --- a/.azure-pipelines/build-template.yml +++ b/.azure-pipelines/build-template.yml @@ -88,7 +88,7 @@ jobs: ${{ if ne(parameters.pool, 'default') }}: name: ${{ parameters.pool }} ${{ else }}: - vmImage: 'ubuntu-20.04' + vmImage: 'ubuntu-24.04' container: image: sonicdev-microsoft.azurecr.io:443/${{ parameters.sonic_slave }}:latest diff --git a/.azure-pipelines/gcov.yml b/.azure-pipelines/gcov.yml index b28aa238ad..2b962ce815 100644 --- a/.azure-pipelines/gcov.yml +++ b/.azure-pipelines/gcov.yml @@ -44,7 +44,7 @@ jobs: ${{ if ne(parameters.pool, 'default') }}: name: ${{ parameters.pool }} ${{ if eq(parameters.pool, 'default') }}: - vmImage: 'ubuntu-20.04' + vmImage: 'ubuntu-24.04' variables: DIFF_COVER_CHECK_THRESHOLD: 80 diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 3c1596eef9..33b457eea6 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -16,7 +16,7 @@ on: jobs: analyze: name: Analyze - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 permissions: actions: read contents: read From c1cd7e770d8e1d95b970e63aa7e0b3b582fd8c7e Mon Sep 17 00:00:00 2001 From: yijingyan2 Date: Mon, 17 Nov 2025 05:12:28 +0000 Subject: [PATCH 3/3] update image ubuntu-20.04 to ubuntu-22.04 Signed-off-by: yijingyan2 --- .azure-pipelines/test-docker-sonic-vs-template.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/test-docker-sonic-vs-template.yml b/.azure-pipelines/test-docker-sonic-vs-template.yml index a3c694bb3f..05c947a7f1 100644 --- a/.azure-pipelines/test-docker-sonic-vs-template.yml +++ b/.azure-pipelines/test-docker-sonic-vs-template.yml @@ -71,12 +71,12 @@ jobs: inputs: source: specific project: build - pipeline: sonic-net.sonic-buildimage-ubuntu20.04 + pipeline: sonic-net.sonic-buildimage-ubuntu22.04 artifact: sonic-buildimage.amd64.ubuntu20_04 runVersion: 'latestFromBranch' runBranch: 'refs/heads/${{ parameters.sonic_buildimage_ubuntu20_04 }}' path: $(Build.ArtifactStagingDirectory)/download - displayName: "Download sonic buildimage ubuntu20.04 deb packages" + displayName: "Download sonic buildimage ubuntu22.04 deb packages" - script: | set -ex