From 7d30c9f6975b41e781bb765860cdbbd15084dfbf Mon Sep 17 00:00:00 2001 From: Liu Shilong Date: Wed, 28 Dec 2022 11:19:32 +0800 Subject: [PATCH 1/5] Fix sonic-slave docker image environment issue. (#727) * Use correct sonic-slave image. --- .azure-pipelines/build-sairedis-template.yml | 2 +- .azure-pipelines/build-swss-template.yml | 2 +- .azure-pipelines/build-template.yml | 2 +- azure-pipelines.yml | 12 ++++++------ 4 files changed, 9 insertions(+), 9 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 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 e50ee9ea263c8928b5ad3a91f5a1791495428533 Mon Sep 17 00:00:00 2001 From: Liu Shilong Date: Thu, 5 Jan 2023 10:12:49 +0800 Subject: [PATCH 2/5] Simplify azure pipeline build template (#729) * Simplify azure pipeline build template --- .azure-pipelines/build-template.yml | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/.azure-pipelines/build-template.yml b/.azure-pipelines/build-template.yml index eab9a1cf7..1062eedf9 100644 --- a/.azure-pipelines/build-template.yml +++ b/.azure-pipelines/build-template.yml @@ -68,8 +68,6 @@ jobs: swig displayName: "Install dependencies" - task: DownloadPipelineArtifact@2 - # amd64 artifact name does not has arch suffix - condition: eq('${{ parameters.arch }}', 'amd64') inputs: source: specific project: build @@ -77,25 +75,14 @@ jobs: runVersion: 'latestFromBranch' runBranch: 'refs/heads/$(BUILD_BRANCH)' path: $(Build.ArtifactStagingDirectory)/download - artifact: common-lib + ${{ if eq(parameters.arch, 'amd64') }}: + artifact: common-lib + ${{ else }}: + artifact: common-lib.${{ parameters.arch }} patterns: | target/debs/${{ parameters.debian_version }}/libyang-*.deb target/debs/${{ parameters.debian_version }}/libyang_*.deb - displayName: "Download libyang from amd64 common lib" - - task: DownloadPipelineArtifact@2 - condition: ne('${{ parameters.arch }}', 'amd64') - inputs: - source: specific - project: build - pipeline: Azure.sonic-buildimage.common_libs - runVersion: 'latestFromBranch' - runBranch: 'refs/heads/$(BUILD_BRANCH)' - path: $(Build.ArtifactStagingDirectory)/download - artifact: common-lib.${{ parameters.arch }} - patterns: | - target/debs/${{ parameters.debian_version }}/libyang-*.deb - target/debs/${{ parameters.debian_version }}/libyang_*.deb - displayName: "Download libyang from common lib" + displayName: "Download libyang from ${{ parameters.arch }} common lib" - script: | set -ex sudo dpkg -i $(find ./download -name *.deb) From 5000aa1f9b1cd425174b421a1be4c2ef29cfca83 Mon Sep 17 00:00:00 2001 From: Liu Shilong Date: Thu, 2 Mar 2023 18:57:19 +0800 Subject: [PATCH 3/5] [ci] Fix apt-get install unable locate package issue. (#753) run 'apt-get update' before 'apt-get install' --- .azure-pipelines/build-sairedis-template.yml | 2 ++ .azure-pipelines/build-swss-template.yml | 2 ++ .azure-pipelines/build-template.yml | 2 ++ .azure-pipelines/build_and_install_module.sh | 1 + 4 files changed, 7 insertions(+) diff --git a/.azure-pipelines/build-sairedis-template.yml b/.azure-pipelines/build-sairedis-template.yml index 34c425015..d4efadef9 100644 --- a/.azure-pipelines/build-sairedis-template.yml +++ b/.azure-pipelines/build-sairedis-template.yml @@ -63,6 +63,8 @@ jobs: git status displayName: Set up sonic-sairedis branch - script: | + set -ex + sudo apt-get update sudo apt-get install -qq -y \ qtbase5-dev \ libdbus-glib-1-2 \ diff --git a/.azure-pipelines/build-swss-template.yml b/.azure-pipelines/build-swss-template.yml index 776170050..1f7a49497 100644 --- a/.azure-pipelines/build-swss-template.yml +++ b/.azure-pipelines/build-swss-template.yml @@ -58,6 +58,8 @@ jobs: git status displayName: Set up sonic-swss branch - script: | + set -ex + sudo apt-get update sudo apt-get install -y libhiredis0.14 libhiredis-dev sudo apt-get install -y libzmq5 libzmq3-dev sudo apt-get install -qq -y \ diff --git a/.azure-pipelines/build-template.yml b/.azure-pipelines/build-template.yml index 1062eedf9..f3d729972 100644 --- a/.azure-pipelines/build-template.yml +++ b/.azure-pipelines/build-template.yml @@ -59,6 +59,8 @@ jobs: - checkout: self clean: true - script: | + set -ex + sudo apt-get update sudo apt-get install -qq -y \ libhiredis-dev \ libnl-3-dev \ diff --git a/.azure-pipelines/build_and_install_module.sh b/.azure-pipelines/build_and_install_module.sh index 4e19a0d2d..fc7eed658 100755 --- a/.azure-pipelines/build_and_install_module.sh +++ b/.azure-pipelines/build_and_install_module.sh @@ -26,6 +26,7 @@ function build_and_install_kmodule() SUBLEVEL=$(echo $KERNEL_MAINVERSION | cut -d. -f3) # Install the required debian packages to build the kernel modules + apt-get update apt-get install -y build-essential linux-headers-${KERNEL_RELEASE} autoconf pkg-config fakeroot apt-get install -y flex bison libssl-dev libelf-dev apt-get install -y libnl-route-3-200 libnl-route-3-dev libnl-cli-3-200 libnl-cli-3-dev libnl-3-dev From 8491082c1c042ff83590c9e7b8f96846c669167f Mon Sep 17 00:00:00 2001 From: shilongliu Date: Thu, 9 Mar 2023 13:42:43 +0800 Subject: [PATCH 4/5] [ci] Continue on error when running test. --- .azure-pipelines/test-docker-sonic-vs-template.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.azure-pipelines/test-docker-sonic-vs-template.yml b/.azure-pipelines/test-docker-sonic-vs-template.yml index 698bfc770..dae4c4a09 100644 --- a/.azure-pipelines/test-docker-sonic-vs-template.yml +++ b/.azure-pipelines/test-docker-sonic-vs-template.yml @@ -87,6 +87,8 @@ jobs: rm -rf $(Build.ArtifactStagingDirectory)/download displayName: "Run vs tests" + ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: + continueOnError: true - task: PublishTestResults@2 inputs: From 43e6827cf6875ea699c272f33139eaef4d4e044a Mon Sep 17 00:00:00 2001 From: Saikrishna Arcot Date: Sun, 19 Feb 2023 18:56:00 -0800 Subject: [PATCH 5/5] Update path to sairedis tests (#747) The path to the sairedis test binary (for `setcap`) has changed after sonic-net/sonic-sairedis#1197. Update the path here. Signed-off-by: Saikrishna Arcot --- .azure-pipelines/build-sairedis-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines/build-sairedis-template.yml b/.azure-pipelines/build-sairedis-template.yml index d4efadef9..8cf21e123 100644 --- a/.azure-pipelines/build-sairedis-template.yml +++ b/.azure-pipelines/build-sairedis-template.yml @@ -131,7 +131,7 @@ jobs: ./autogen.sh DEB_BUILD_OPTIONS=nocheck fakeroot dpkg-buildpackage -b -us -uc -Tbinary-syncd-vs -j$(nproc) # Add SYS_TIME capability for settimeofday ok in syncd test - sudo setcap "cap_sys_time=eip" syncd/.libs/tests + sudo setcap "cap_sys_time=eip" syncd/.libs/syncd_tests make check mv ../*.deb . displayName: "Compile sonic sairedis"