Skip to content

Commit

Permalink
[ci] Fix apt-get install unable locate package issue. (#1212) (#1221)
Browse files Browse the repository at this point in the history
* [ci] Fix apt-get install unable locate package issue. (#1212)
* [ci] Continue on error when running test.
* [ci]: use native armhf and arm64 pool (#965)
  • Loading branch information
liushilongbuaa committed Mar 14, 2023
1 parent 54116e9 commit 33c2cf2
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 6 deletions.
2 changes: 2 additions & 0 deletions .azure-pipelines/build-swss-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ jobs:

steps:
- 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 \
Expand Down
4 changes: 4 additions & 0 deletions .azure-pipelines/build-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ parameters:
type: string
values:
- sonicbld
- sonicbld-arm64
- sonicbld-armhf
- default
default: default

Expand Down Expand Up @@ -49,6 +51,8 @@ jobs:

steps:
- script: |
set -ex
sudo apt-get update
sudo apt-get install -qq -y \
qtbase5-dev \
libdbus-glib-1-2 \
Expand Down
1 change: 1 addition & 0 deletions .azure-pipelines/build_and_install_module.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions .azure-pipelines/test-docker-sonic-vs-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ jobs:
displayName: vstest
timeoutInMinutes: ${{ parameters.timeout }}

pool:
vmImage: 'ubuntu-20.04'
pool: sonic-common

steps:
- task: DownloadPipelineArtifact@2
Expand Down Expand Up @@ -41,6 +40,7 @@ jobs:
set -x
sudo sonic-sairedis/.azure-pipelines/build_and_install_module.sh
sudo apt-get update
sudo apt-get install -y libhiredis0.14
sudo dpkg -i --force-confask,confnew ../libswsscommon_1.0.0_amd64.deb || apt-get install -f
sudo dpkg -i ../python3-swsscommon_1.0.0_amd64.deb
Expand All @@ -59,6 +59,8 @@ jobs:
pushd sonic-swss/tests
sudo py.test -v --force-flaky --junitxml=tr.xml --imgname=docker-sonic-vs:$(Build.DefinitionName).$(Build.BuildNumber)
displayName: "Run vs tests"
${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
continueOnError: true
- task: PublishTestResults@2
inputs:
Expand Down
8 changes: 4 additions & 4 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ stages:
- template: .azure-pipelines/build-template.yml
parameters:
arch: armhf
timeout: 180
pool: sonicbld
timeout: 240
pool: sonicbld-armhf
sonic_slave: sonic-slave-buster-armhf
swss_common_artifact_name: sonic-swss-common.armhf
artifact_name: sonic-sairedis.armhf
Expand All @@ -46,8 +46,8 @@ stages:
- template: .azure-pipelines/build-template.yml
parameters:
arch: arm64
timeout: 180
pool: sonicbld
timeout: 240
pool: sonicbld-arm64
sonic_slave: sonic-slave-buster-arm64
swss_common_artifact_name: sonic-swss-common.arm64
artifact_name: sonic-sairedis.arm64
Expand Down

0 comments on commit 33c2cf2

Please sign in to comment.