Skip to content

Commit 57167c0

Browse files
authored
Update build pipeline to build for Bullseye (sonic-net#2717)
* Update build pipeline to build for Bullseye With the merge of sonic-net#13294, docker-sonic-vs is now based on Bullseye. Switch to building for Bullseye to match that change. Signed-off-by: Saikrishna Arcot <[email protected]> * Reduce dependency list to just development packages Signed-off-by: Saikrishna Arcot <[email protected]> * Update .NET repo URL and package name Signed-off-by: Saikrishna Arcot <[email protected]> --------- Signed-off-by: Saikrishna Arcot <[email protected]>
1 parent 7a215d0 commit 57167c0

4 files changed

Lines changed: 33 additions & 41 deletions

File tree

.azure-pipelines/build-template.yml

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,12 @@ jobs:
6767
submodules: true
6868
- script: |
6969
sudo apt-get update
70-
sudo apt-get install -y libhiredis0.14 libhiredis-dev
71-
sudo apt-get install -y libzmq5 libzmq3-dev
72-
sudo apt-get install -qq -y \
73-
libhiredis-dev \
74-
swig3.0
75-
sudo apt-get install -y libdbus-1-3
76-
sudo apt-get install -y libteam-dev \
77-
libteam5 \
78-
libteamdctl0
70+
sudo apt-get install -y \
71+
libhiredis-dev \
72+
libzmq3-dev \
73+
swig4.0 \
74+
libdbus-1-dev \
75+
libteam-dev
7976
displayName: "Install dependencies"
8077
- task: DownloadPipelineArtifact@2
8178
inputs:
@@ -120,20 +117,20 @@ jobs:
120117
runBranch: 'refs/heads/$(BUILD_BRANCH)'
121118
path: $(Build.ArtifactStagingDirectory)/download
122119
patterns: |
123-
target/debs/buster/libnl-3-200_*.deb
124-
target/debs/buster/libnl-3-dev_*.deb
125-
target/debs/buster/libnl-genl-3-200_*.deb
126-
target/debs/buster/libnl-genl-3-dev_*.deb
127-
target/debs/buster/libnl-route-3-200_*.deb
128-
target/debs/buster/libnl-route-3-dev_*.deb
129-
target/debs/buster/libnl-nf-3-200_*.deb
130-
target/debs/buster/libnl-nf-3-dev_*.deb
131-
target/debs/buster/libyang_*.deb
120+
target/debs/bullseye/libnl-3-200_*.deb
121+
target/debs/bullseye/libnl-3-dev_*.deb
122+
target/debs/bullseye/libnl-genl-3-200_*.deb
123+
target/debs/bullseye/libnl-genl-3-dev_*.deb
124+
target/debs/bullseye/libnl-route-3-200_*.deb
125+
target/debs/bullseye/libnl-route-3-dev_*.deb
126+
target/debs/bullseye/libnl-nf-3-200_*.deb
127+
target/debs/bullseye/libnl-nf-3-dev_*.deb
128+
target/debs/bullseye/libyang_*.deb
132129
displayName: "Download common libs"
133130
- script: |
134131
set -ex
135132
cd download
136-
sudo dpkg -i $(find target/debs/buster -type f)
133+
sudo dpkg -i $(find target/debs/bullseye -type f)
137134
sudo dpkg -i $(ls *.deb)
138135
cd ..
139136
rm -rf download

.azure-pipelines/docker-sonic-vs/Dockerfile

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,15 @@ ARG need_dbg
55

66
ADD ["debs", "/debs"]
77

8-
RUN dpkg --purge python-swsscommon python3-swsscommon swss libsairedis sonic-db-cli libswsscommon libsaimetadata libsaivs syncd-vs
8+
RUN dpkg -i /debs/libswsscommon_1.0.0_amd64.deb \
9+
/debs/python3-swsscommon_1.0.0_amd64.deb \
10+
/debs/sonic-db-cli_1.0.0_amd64.deb \
11+
/debs/libsaimetadata_1.0.0_amd64.deb \
12+
/debs/libsairedis_1.0.0_amd64.deb \
13+
/debs/libsaivs_1.0.0_amd64.deb \
14+
/debs/syncd-vs_1.0.0_amd64.deb \
15+
/debs/swss_1.0.0_amd64.deb
916

10-
RUN dpkg -i /debs/libswsscommon_1.0.0_amd64.deb
11-
RUN dpkg -i /debs/python-swsscommon_1.0.0_amd64.deb
12-
RUN dpkg -i /debs/python3-swsscommon_1.0.0_amd64.deb
13-
RUN dpkg -i /debs/sonic-db-cli_1.0.0_amd64.deb
14-
15-
RUN dpkg -i /debs/libsaimetadata_1.0.0_amd64.deb
16-
RUN dpkg -i /debs/libsairedis_1.0.0_amd64.deb
17-
RUN dpkg -i /debs/libsaivs_1.0.0_amd64.deb
18-
RUN dpkg -i /debs/syncd-vs_1.0.0_amd64.deb
19-
20-
RUN dpkg --purge swss
21-
RUN dpkg -i /debs/swss_1.0.0_amd64.deb
2217
RUN if [ "$need_dbg" = "y" ] ; then dpkg -i /debs/swss-dbg_1.0.0_amd64.deb ; fi
2318

2419
RUN apt-get update

.azure-pipelines/gcov.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ jobs:
5959
set -ex
6060
# Install .NET CORE
6161
curl -sSL https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
62-
sudo apt-add-repository https://packages.microsoft.com/debian/10/prod
62+
sudo apt-add-repository https://packages.microsoft.com/debian/11/prod
6363
sudo apt-get update
64-
sudo apt-get install -y dotnet-sdk-5.0
64+
sudo apt-get install -y dotnet-sdk-7.0
6565
displayName: "Install .NET CORE"
6666
- script: |
6767
sudo apt-get install -y lcov

azure-pipelines.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ stages:
4141
- template: .azure-pipelines/build-template.yml
4242
parameters:
4343
arch: amd64
44-
sonic_slave: sonic-slave-buster
44+
sonic_slave: sonic-slave-bullseye
4545
common_lib_artifact_name: common-lib
4646
swss_common_artifact_name: sonic-swss-common
4747
sairedis_artifact_name: sonic-sairedis
@@ -55,7 +55,7 @@ stages:
5555
- template: .azure-pipelines/build-template.yml
5656
parameters:
5757
arch: amd64
58-
sonic_slave: sonic-slave-buster
58+
sonic_slave: sonic-slave-bullseye
5959
common_lib_artifact_name: common-lib
6060
swss_common_artifact_name: sonic-swss-common
6161
sairedis_artifact_name: sonic-sairedis
@@ -71,7 +71,7 @@ stages:
7171
arch: armhf
7272
timeout: 240
7373
pool: sonicbld-armhf
74-
sonic_slave: sonic-slave-buster-armhf
74+
sonic_slave: sonic-slave-bullseye-armhf
7575
common_lib_artifact_name: common-lib.armhf
7676
swss_common_artifact_name: sonic-swss-common.armhf
7777
sairedis_artifact_name: sonic-sairedis.armhf
@@ -83,7 +83,7 @@ stages:
8383
arch: arm64
8484
timeout: 240
8585
pool: sonicbld-arm64
86-
sonic_slave: sonic-slave-buster-arm64
86+
sonic_slave: sonic-slave-bullseye-arm64
8787
common_lib_artifact_name: common-lib.arm64
8888
swss_common_artifact_name: sonic-swss-common.arm64
8989
sairedis_artifact_name: sonic-sairedis.arm64
@@ -121,7 +121,7 @@ stages:
121121
parameters:
122122
log_artifact_name: log
123123
gcov_artifact_name: sonic-gcov
124-
sonic_slave: sonic-slave-buster
124+
sonic_slave: sonic-slave-bullseye
125125
archive_gcov: true
126126

127127
- stage: TestAsan
@@ -132,7 +132,7 @@ stages:
132132
parameters:
133133
log_artifact_name: log-asan
134134
gcov_artifact_name: sonic-gcov
135-
sonic_slave: sonic-slave-buster
135+
sonic_slave: sonic-slave-bullseye
136136
docker_sonic_vs_name: docker-sonic-vs-asan
137137
asan: true
138138

@@ -143,7 +143,7 @@ stages:
143143
- template: .azure-pipelines/gcov.yml
144144
parameters:
145145
arch: amd64
146-
sonic_slave: sonic-slave-buster
146+
sonic_slave: sonic-slave-bullseye
147147
swss_common_artifact_name: sonic-swss-common
148148
sairedis_artifact_name: sonic-sairedis
149149
swss_artifact_name: sonic-swss

0 commit comments

Comments
 (0)