Skip to content

Commit 504daa1

Browse files
authored
[az] Install vpp artifacts (#3609)
* [az] Install vpp artifacts Those packages are required by sonic-sairedis What I did Modified az pipeline to install vpp packages Why I did it sonic-sairedis have dependency now on those packages
1 parent bc750a5 commit 504daa1

File tree

3 files changed

+64
-2
lines changed

3 files changed

+64
-2
lines changed

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

+12-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,18 @@ jobs:
146146
path: $(Build.ArtifactStagingDirectory)/download
147147
patterns: '**/target/debs/${{ parameters.debian_version }}/framework_*.deb'
148148
displayName: "Download sonic-buildimage sonic-framework package"
149-
149+
- task: DownloadPipelineArtifact@2
150+
inputs:
151+
source: specific
152+
project: build
153+
pipeline: sonic-net.sonic-platform-vpp
154+
artifact: vpp
155+
runVersion: 'latestFromBranch'
156+
runBranch: 'refs/heads/main'
157+
allowPartiallySucceededBuilds: true
158+
path: $(Build.ArtifactStagingDirectory)/download
159+
displayName: "Download sonic platform-vpp deb packages"
160+
condition: eq('${{ parameters.arch }}', 'amd64')
150161
- script: |
151162
set -ex
152163
echo $(Build.DefinitionName).$(Build.BuildNumber)

.azure-pipelines/build-template.yml

+34-1
Original file line numberDiff line numberDiff line change
@@ -179,12 +179,45 @@ jobs:
179179
set -ex
180180
cd download
181181
sudo dpkg -i $(find common -type f -name '*.deb')
182+
cd ..
183+
workingDirectory: $(Build.ArtifactStagingDirectory)
184+
displayName: "Install libnl3"
185+
- task: DownloadPipelineArtifact@2
186+
inputs:
187+
source: specific
188+
project: build
189+
pipeline: sonic-net.sonic-platform-vpp
190+
artifact: vpp
191+
runVersion: 'latestFromBranch'
192+
runBranch: 'refs/heads/main'
193+
allowPartiallySucceededBuilds: true
194+
path: $(Build.ArtifactStagingDirectory)/download
195+
displayName: "Download sonic platform-vpp deb packages"
196+
condition: eq('${{ parameters.arch }}', 'amd64')
197+
- script: |
198+
set -ex
199+
sudo env VPP_INSTALL_SKIP_SYSCTL=1 dpkg -i download/libvppinfra-dev_*_${{ parameters.arch }}.deb
200+
sudo env VPP_INSTALL_SKIP_SYSCTL=1 dpkg -i download/libvppinfra_*_${{ parameters.arch }}.deb
201+
sudo env VPP_INSTALL_SKIP_SYSCTL=1 dpkg -i download/vpp_*_${{ parameters.arch }}.deb
202+
sudo env VPP_INSTALL_SKIP_SYSCTL=1 dpkg -i download/vpp-crypto-engines_*_${{ parameters.arch }}.deb
203+
sudo env VPP_INSTALL_SKIP_SYSCTL=1 dpkg -i download/vpp-dbg_*_${{ parameters.arch }}.deb
204+
sudo env VPP_INSTALL_SKIP_SYSCTL=1 dpkg -i download/vpp-dev_*_${{ parameters.arch }}.deb
205+
sudo env VPP_INSTALL_SKIP_SYSCTL=1 dpkg -i download/vpp-plugin-core_*_${{ parameters.arch }}.deb
206+
sudo env VPP_INSTALL_SKIP_SYSCTL=1 dpkg -i download/vpp-plugin-devtools_*_${{ parameters.arch }}.deb
207+
sudo env VPP_INSTALL_SKIP_SYSCTL=1 dpkg -i download/vpp-plugin-dpdk_*_${{ parameters.arch }}.deb
208+
sudo env VPP_INSTALL_SKIP_SYSCTL=1 dpkg -i download/python3-vpp-api_*_${{ parameters.arch }}.deb
209+
workingDirectory: $(Build.ArtifactStagingDirectory)
210+
displayName: "Install sonic platform-vpp packages"
211+
condition: eq('${{ parameters.arch }}', 'amd64')
212+
- script: |
213+
set -ex
214+
cd download
182215
sudo dpkg -i $(find swsscommon -type f -name '*.deb')
183216
sudo dpkg -i $(find sairedis -type f -name '*.deb')
184217
cd ..
185218
rm -rf download
186219
workingDirectory: $(Build.ArtifactStagingDirectory)
187-
displayName: "Install libnl3, sonic swss common and sairedis"
220+
displayName: "Install sonic swss common and sairedis"
188221
- script: |
189222
set -ex
190223
tar czf pytest.tgz tests

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

+18
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,24 @@ RUN dpkg --purge python3-swsscommon sonic-db-cli libsaimetadata libsairedis libs
1717

1818
RUN apt-get update
1919

20+
# vpp package configure requires to set:
21+
# permission denied on key "vm.nr_hugepages"
22+
# permission denied on key "vm.hugetlb_shm_group"
23+
# permission denied on key "fs.protected_fifos"
24+
# permission denied on key "fs.protected_hardlinks"
25+
# permission denied on key "fs.protected_regular"
26+
# permission denied on key "fs.protected_symlinks"
27+
28+
# which can't be done during "docker build" command
29+
# so let's put "true" command as sysctl, and after install let's bring it back
30+
31+
RUN cp /usr/sbin/sysctl /usr/sbin/sysctl.org
32+
RUN cp /usr/bin/true /usr/sbin/sysctl
33+
34+
RUN apt install -y $(ls /debs/*.deb | grep vpp)
35+
36+
RUN mv /usr/sbin/sysctl.org /usr/sbin/sysctl
37+
2038
RUN apt install -y /debs/libdashapi_1.0.0_amd64.deb \
2139
/debs/libswsscommon_1.0.0_amd64.deb \
2240
/debs/python3-swsscommon_1.0.0_amd64.deb \

0 commit comments

Comments
 (0)