Cherry-pick PRs in master branch to unblock PR checks. (#762)

cherry-pick PRs: 43e6827 Update path to sairedis tests (#747) 8491082 [ci] Continue on error when running test. (#757) 5000aa1 [ci] Fix apt-get install unable locate package issue. (#753) e50ee9e Simplify azure pipeline build template (#729) 7d30c9f Fix sonic-slave docker image environment issue. (#727)
sonic-net · Mar 10, 2023 · 416ca70 · 416ca70
1 parent e732ed0
commit 416ca70
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 28 deletions.
diff --git 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:
@@ -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 \
@@ -129,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"

diff --git 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
@@ -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
@@ -53,12 +53,14 @@ 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
     clean: true
   - script: |
+      set -ex
+      sudo apt-get update
       sudo apt-get install -qq -y \
         libhiredis-dev \
         libnl-3-dev \
@@ -68,34 +70,21 @@ 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
-      pipeline: Azure.sonic-buildimage.common_libs
-      runVersion: 'latestFromBranch'
-      runBranch: 'refs/heads/$(BUILD_BRANCH)'
-      path: $(Build.ArtifactStagingDirectory)/download
-      artifact: common-lib
-      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 }}
+      ${{ 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 common lib"
+    displayName: "Download libyang from ${{ parameters.arch }} common lib"
   - script: |
       set -ex
       sudo dpkg -i $(find ./download -name *.deb)

diff --git 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

diff --git 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:

diff --git 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