Skip to content

Commit c3c9dec

Browse files
Cherry-pick PRs in master branch to unblock PR checks. (#759)
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)
1 parent 27e5228 commit c3c9dec

6 files changed

+17
-8
lines changed

.azure-pipelines/build-sairedis-template.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
vmImage: 'ubuntu-20.04'
4646

4747
container:
48-
image: sonicdev-microsoft.azurecr.io:443/${{ parameters.sonic_slave }}:latest
48+
image: sonicdev-microsoft.azurecr.io:443/${{ parameters.sonic_slave }}
4949

5050
steps:
5151
- checkout: sonic-sairedis
@@ -58,6 +58,8 @@ jobs:
5858
git status
5959
displayName: Set up sonic-sairedis branch
6060
- script: |
61+
set -ex
62+
sudo apt-get update
6163
sudo apt-get install -qq -y \
6264
qtbase5-dev \
6365
libdbus-glib-1-2 \

.azure-pipelines/build-swss-template.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
vmImage: 'ubuntu-20.04'
4646

4747
container:
48-
image: sonicdev-microsoft.azurecr.io:443/${{ parameters.sonic_slave }}:latest
48+
image: sonicdev-microsoft.azurecr.io:443/${{ parameters.sonic_slave }}
4949

5050
steps:
5151
- checkout: sonic-swss
@@ -58,6 +58,8 @@ jobs:
5858
git status
5959
displayName: Set up sonic-swss branch
6060
- script: |
61+
set -ex
62+
sudo apt-get update
6163
sudo apt-get install -y libhiredis0.14 libhiredis-dev
6264
sudo apt-get install -y libzmq5 libzmq3-dev
6365
sudo apt-get install -qq -y \

.azure-pipelines/build-template.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,14 @@ jobs:
4949
vmImage: 'ubuntu-20.04'
5050

5151
container:
52-
image: sonicdev-microsoft.azurecr.io:443/${{ parameters.sonic_slave }}:latest
52+
image: sonicdev-microsoft.azurecr.io:443/${{ parameters.sonic_slave }}
5353

5454
steps:
5555
- checkout: self
5656
clean: true
5757
- script: |
58+
set -ex
59+
sudo apt-get update
5860
sudo apt-get install -qq -y \
5961
libhiredis-dev \
6062
libnl-3-dev \

.azure-pipelines/build_and_install_module.sh

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ function build_and_install_kmodule()
2626
SUBLEVEL=$(echo $KERNEL_MAINVERSION | cut -d. -f3)
2727

2828
# Install the required debian packages to build the kernel modules
29+
apt-get update
2930
apt-get install -y build-essential linux-headers-${KERNEL_RELEASE} autoconf pkg-config fakeroot
3031
apt-get install -y flex bison libssl-dev libelf-dev
3132
apt-get install -y libnl-route-3-200 libnl-route-3-dev libnl-cli-3-200 libnl-cli-3-dev libnl-3-dev

.azure-pipelines/test-docker-sonic-vs-template.yml

+2
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ jobs:
6060
sudo py.test -v --force-flaky --junitxml=tr.xml --imgname=docker-sonic-vs:$(Build.DefinitionName).$(Build.BuildNumber)
6161
rm -rf $(Build.ArtifactStagingDirectory)/download
6262
displayName: "Run vs tests"
63+
${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
64+
continueOnError: true
6365
6466
- task: PublishTestResults@2
6567
inputs:

azure-pipelines.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ stages:
9191
- template: .azure-pipelines/build-template.yml
9292
parameters:
9393
arch: amd64
94-
sonic_slave: sonic-slave-${{ parameters.debian_version }}
94+
sonic_slave: sonic-slave-${{ parameters.debian_version }}:$(BUILD_BRANCH)
9595
artifact_name: sonic-swss-common
9696
run_unit_test: true
9797
archive_gcov: true
@@ -105,15 +105,15 @@ stages:
105105
arch: armhf
106106
timeout: 180
107107
pool: sonicbld-armhf
108-
sonic_slave: sonic-slave-${{ parameters.debian_version }}-armhf
108+
sonic_slave: sonic-slave-${{ parameters.debian_version }}-armhf:$(BUILD_BRANCH)
109109
artifact_name: sonic-swss-common.armhf
110110

111111
- template: .azure-pipelines/build-template.yml
112112
parameters:
113113
arch: arm64
114114
timeout: 180
115115
pool: sonicbld-arm64
116-
sonic_slave: sonic-slave-${{ parameters.debian_version }}-arm64
116+
sonic_slave: sonic-slave-${{ parameters.debian_version }}-arm64:$(BUILD_BRANCH)
117117
artifact_name: sonic-swss-common.arm64
118118

119119
- stage: BuildSairedis
@@ -123,7 +123,7 @@ stages:
123123
- template: .azure-pipelines/build-sairedis-template.yml
124124
parameters:
125125
arch: amd64
126-
sonic_slave: sonic-slave-${{ parameters.debian_version }}
126+
sonic_slave: sonic-slave-${{ parameters.debian_version }}:$(BUILD_BRANCH)
127127
swss_common_artifact_name: sonic-swss-common
128128
artifact_name: sonic-sairedis
129129
syslog_artifact_name: sonic-sairedis.syslog
@@ -135,7 +135,7 @@ stages:
135135
- template: .azure-pipelines/build-swss-template.yml
136136
parameters:
137137
arch: amd64
138-
sonic_slave: sonic-slave-${{ parameters.debian_version }}
138+
sonic_slave: sonic-slave-${{ parameters.debian_version }}:$(BUILD_BRANCH)
139139
swss_common_artifact_name: sonic-swss-common
140140
sairedis_artifact_name: sonic-sairedis
141141
artifact_name: sonic-swss

0 commit comments

Comments
 (0)