From a40308c82040acef29dd6fd575d3bc727180973d Mon Sep 17 00:00:00 2001 From: shilongliu Date: Mon, 26 Dec 2022 14:47:33 +0800 Subject: [PATCH 1/2] Use correct sonic-slave image. --- .azure-pipelines/build-template.yml | 2 +- azure-pipelines.yml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.azure-pipelines/build-template.yml b/.azure-pipelines/build-template.yml index f1220a224..eab9a1cf7 100644 --- a/.azure-pipelines/build-template.yml +++ b/.azure-pipelines/build-template.yml @@ -53,7 +53,7 @@ jobs: vmImage: 'ubuntu-20.04' container: - image: sonicdev-microsoft.azurecr.io:443/${{ parameters.sonic_slave }}:latest + image: sonicdev-microsoft.azurecr.io:443/${{ parameters.sonic_slave }} steps: - checkout: self diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5c81fc61c..58ca47b1c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -91,7 +91,7 @@ stages: - template: .azure-pipelines/build-template.yml parameters: arch: amd64 - sonic_slave: sonic-slave-${{ parameters.debian_version }} + sonic_slave: sonic-slave-${{ parameters.debian_version }}:$(BUILD_BRANCH) artifact_name: sonic-swss-common run_unit_test: true archive_gcov: true @@ -106,7 +106,7 @@ stages: arch: armhf timeout: 180 pool: sonicbld-armhf - sonic_slave: sonic-slave-${{ parameters.debian_version }}-armhf + sonic_slave: sonic-slave-${{ parameters.debian_version }}-armhf:$(BUILD_BRANCH) artifact_name: sonic-swss-common.armhf debian_version: ${{ parameters.debian_version }} @@ -115,7 +115,7 @@ stages: arch: arm64 timeout: 180 pool: sonicbld-arm64 - sonic_slave: sonic-slave-${{ parameters.debian_version }}-arm64 + sonic_slave: sonic-slave-${{ parameters.debian_version }}-arm64:$(BUILD_BRANCH) artifact_name: sonic-swss-common.arm64 debian_version: ${{ parameters.debian_version }} @@ -127,7 +127,7 @@ stages: parameters: arch: amd64 timeout: 180 - sonic_slave: sonic-slave-bullseye + sonic_slave: sonic-slave-bullseye:$(BUILD_BRANCH) artifact_name: sonic-swss-common.bullseye.amd64 debian_version: bullseye @@ -138,7 +138,7 @@ stages: - template: .azure-pipelines/build-sairedis-template.yml parameters: arch: amd64 - sonic_slave: sonic-slave-${{ parameters.debian_version }} + sonic_slave: sonic-slave-${{ parameters.debian_version }}:$(BUILD_BRANCH) swss_common_artifact_name: sonic-swss-common artifact_name: sonic-sairedis syslog_artifact_name: sonic-sairedis.syslog @@ -151,7 +151,7 @@ stages: - template: .azure-pipelines/build-swss-template.yml parameters: arch: amd64 - sonic_slave: sonic-slave-${{ parameters.debian_version }} + sonic_slave: sonic-slave-${{ parameters.debian_version }}:$(BUILD_BRANCH) swss_common_artifact_name: sonic-swss-common sairedis_artifact_name: sonic-sairedis artifact_name: sonic-swss From a75ae6eb9511c9f1ee11752d77386b0c45a4151d Mon Sep 17 00:00:00 2001 From: shilongliu Date: Tue, 27 Dec 2022 17:23:45 +0800 Subject: [PATCH 2/2] fix --- .azure-pipelines/build-sairedis-template.yml | 2 +- .azure-pipelines/build-swss-template.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/build-sairedis-template.yml b/.azure-pipelines/build-sairedis-template.yml index f0b067d20..34c425015 100644 --- a/.azure-pipelines/build-sairedis-template.yml +++ b/.azure-pipelines/build-sairedis-template.yml @@ -49,7 +49,7 @@ jobs: vmImage: 'ubuntu-20.04' container: - image: sonicdev-microsoft.azurecr.io:443/${{ parameters.sonic_slave }}:latest + image: sonicdev-microsoft.azurecr.io:443/${{ parameters.sonic_slave }} options: "--privileged" steps: diff --git a/.azure-pipelines/build-swss-template.yml b/.azure-pipelines/build-swss-template.yml index 4e655fd9d..776170050 100644 --- a/.azure-pipelines/build-swss-template.yml +++ b/.azure-pipelines/build-swss-template.yml @@ -45,7 +45,7 @@ jobs: vmImage: 'ubuntu-20.04' container: - image: sonicdev-microsoft.azurecr.io:443/${{ parameters.sonic_slave }}:latest + image: sonicdev-microsoft.azurecr.io:443/${{ parameters.sonic_slave }} steps: - checkout: sonic-swss