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

cherry-pick PRs: 7a6783b [ci] Continue on error when running test. (#757) 1b369ab [ci] Fix apt-get install unable locate package issue. (#753) 28dc42a Fix sonic-slave docker image environment issue. (#727)
sonic-net · Mar 10, 2023 · 14fa3e5 · 14fa3e5
1 parent 3e34309
commit 14fa3e5
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 11 deletions.
diff --git a/.azure-pipelines/build-sairedis-template.yml b/.azure-pipelines/build-sairedis-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-sairedis
@@ -58,6 +58,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
@@ -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
@@ -11,6 +11,8 @@ parameters:
   values:
   - sonicbld
   - sonic-common
+  - sonicbld-armhf
+  - sonicbld-arm64
   - default
   default: default
 
@@ -40,12 +42,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 \

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
@@ -60,6 +60,8 @@ jobs:
       sudo py.test -v --force-flaky --junitxml=tr.xml --imgname=docker-sonic-vs:$(Build.DefinitionName).$(Build.BuildNumber)
       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
@@ -81,8 +81,7 @@ stages:
   - template: .azure-pipelines/build-template.yml
     parameters:
       arch: amd64
-      pool: sonic-common
-      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
 
@@ -94,16 +93,16 @@ stages:
     parameters:
       arch: armhf
       timeout: 180
-      pool: sonicbld
-      sonic_slave: sonic-slave-${{ parameters.debian_version }}-armhf
+      pool: sonicbld-armhf
+      sonic_slave: sonic-slave-${{ parameters.debian_version }}-armhf:$(BUILD_BRANCH)
       artifact_name: sonic-swss-common.armhf
 
   - template: .azure-pipelines/build-template.yml
     parameters:
       arch: arm64
       timeout: 180
-      pool: sonicbld
-      sonic_slave: sonic-slave-${{ parameters.debian_version }}-arm64
+      pool: sonicbld-arm64
+      sonic_slave: sonic-slave-${{ parameters.debian_version }}-arm64:$(BUILD_BRANCH)
       artifact_name: sonic-swss-common.arm64
 
 - stage: BuildSairedis
@@ -113,7 +112,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
@@ -125,7 +124,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