From 209561fe2b9bd5a82b1bc925634690c1e2644605 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Tue, 7 Jan 2025 16:28:40 +0800 Subject: [PATCH] Revert "[202411][Build] Update to build bookworm debian package" --- .azure-pipelines/build.yml | 12 ++++++------ azure-pipelines.yml | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.azure-pipelines/build.yml b/.azure-pipelines/build.yml index 3746a7e61..7ca40a07d 100644 --- a/.azure-pipelines/build.yml +++ b/.azure-pipelines/build.yml @@ -52,15 +52,15 @@ jobs: project: build pipeline: Azure.sonic-buildimage.common_libs runVersion: 'latestFromBranch' - runBranch: 'refs/heads/202411' + runBranch: 'refs/heads/master' path: $(Build.ArtifactStagingDirectory)/download ${{ if eq(parameters.arch, 'amd64') }}: artifact: common-lib ${{ else }}: artifact: common-lib.${{ parameters.arch }} patterns: | - target/debs/bookworm/libyang-*.deb - target/debs/bookworm/libyang_*.deb + target/debs/bullseye/libyang-*.deb + target/debs/bullseye/libyang_*.deb displayName: "Download libyang from common lib" - script: | set -ex @@ -73,11 +73,11 @@ jobs: project: build pipeline: Azure.sonic-swss-common ${{ if eq(parameters.arch, 'amd64') }}: - artifact: sonic-swss-common-bookworm + artifact: sonic-swss-common ${{ else }}: - artifact: sonic-swss-common-bookworm.${{ parameters.arch }} + artifact: sonic-swss-common.${{ parameters.arch }} runVersion: 'latestFromBranch' - runBranch: 'refs/heads/202411' + runBranch: 'refs/heads/master' displayName: "Download sonic-swss-common" - script: | set -ex diff --git a/azure-pipelines.yml b/azure-pipelines.yml index cf4cbfc7d..59adec7a5 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -15,14 +15,14 @@ jobs: pool: vmImage: 'ubuntu-20.04' codeCoverage: false - containerImage: sonicdev-microsoft.azurecr.io:443/sonic-slave-bookworm:latest + containerImage: sonicdev-microsoft.azurecr.io:443/sonic-slave-bullseye:latest - template: .azure-pipelines/build.yml parameters: arch: arm64 pool: sonicbld-arm64 - containerImage: sonicdev-microsoft.azurecr.io:443/sonic-slave-bookworm-arm64:latest + containerImage: sonicdev-microsoft.azurecr.io:443/sonic-slave-bullseye-arm64:latest - template: .azure-pipelines/build.yml parameters: arch: armhf pool: sonicbld-armhf - containerImage: sonicdev-microsoft.azurecr.io:443/sonic-slave-bookworm-armhf:latest + containerImage: sonicdev-microsoft.azurecr.io:443/sonic-slave-bullseye-armhf:latest