From 66f1758bfd864c01cd17ff9e1c07e7523cc70856 Mon Sep 17 00:00:00 2001 From: Saikrishna Arcot Date: Tue, 2 Apr 2024 09:56:35 -0700 Subject: [PATCH 1/2] Add Bookworm build to PR checks Signed-off-by: Saikrishna Arcot --- azure-pipelines.yml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 290523ba0..56c5f338e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -119,6 +119,35 @@ stages: artifact_name: sonic-swss-common.arm64 debian_version: ${{ parameters.debian_version }} +- stage: BuildBookworm + dependsOn: BuildArm + condition: succeeded('BuildArm') + jobs: + - template: .azure-pipelines/build-template.yml + parameters: + arch: amd64 + sonic_slave: sonic-slave-bookworm:$(BUILD_BRANCH) + artifact_name: sonic-swss-common-bookworm + debian_version: bookworm + + - template: .azure-pipelines/build-template.yml + parameters: + arch: armhf + timeout: 180 + pool: sonicbld-armhf + sonic_slave: sonic-slave-bookworm-armhf:$(BUILD_BRANCH) + artifact_name: sonic-swss-common-bookworm.armhf + debian_version: bookworm + + - template: .azure-pipelines/build-template.yml + parameters: + arch: arm64 + timeout: 180 + pool: sonicbld-arm64 + sonic_slave: sonic-slave-bookworm-arm64:$(BUILD_BRANCH) + artifact_name: sonic-swss-common-bookworm.arm64 + debian_version: bookworm + - stage: BuildSairedis dependsOn: Build condition: succeeded('Build') From ae83c79bd3d4758f523f9c976910c4856747e18e Mon Sep 17 00:00:00 2001 From: Saikrishna Arcot Date: Tue, 2 Apr 2024 10:55:19 -0700 Subject: [PATCH 2/2] Keep debian_version as buster Signed-off-by: Saikrishna Arcot --- azure-pipelines.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 56c5f338e..f5f233262 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -128,7 +128,7 @@ stages: arch: amd64 sonic_slave: sonic-slave-bookworm:$(BUILD_BRANCH) artifact_name: sonic-swss-common-bookworm - debian_version: bookworm + debian_version: ${{ parameters.debian_version }} - template: .azure-pipelines/build-template.yml parameters: @@ -137,7 +137,7 @@ stages: pool: sonicbld-armhf sonic_slave: sonic-slave-bookworm-armhf:$(BUILD_BRANCH) artifact_name: sonic-swss-common-bookworm.armhf - debian_version: bookworm + debian_version: ${{ parameters.debian_version }} - template: .azure-pipelines/build-template.yml parameters: @@ -146,7 +146,7 @@ stages: pool: sonicbld-arm64 sonic_slave: sonic-slave-bookworm-arm64:$(BUILD_BRANCH) artifact_name: sonic-swss-common-bookworm.arm64 - debian_version: bookworm + debian_version: ${{ parameters.debian_version }} - stage: BuildSairedis dependsOn: Build