Skip to content

Commit 76e3406

Browse files
authored
[fpmsyncd][MPLS] updates for MPLS plus AZP libnl3 install (#1871)
* "fpmsyncd support" for routes with AF_MPLS and NHs with MPLS attributes. * AZP changes to install libnl3 from sonic-buildimage
1 parent fc6cd81 commit 76e3406

File tree

5 files changed

+291
-24
lines changed

5 files changed

+291
-24
lines changed

.azure-pipelines/build-template.yml

+25-5
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,13 @@ parameters:
2121
- name: sonic_slave
2222
type: string
2323

24+
- name: buildimage_artifact_name
25+
type: string
26+
27+
- name: buildimage_pipeline
28+
type: number
29+
default: 1
30+
2431
- name: sairedis_artifact_name
2532
type: string
2633

@@ -54,10 +61,6 @@ jobs:
5461
sudo apt-get install -y libzmq5 libzmq3-dev
5562
sudo apt-get install -qq -y \
5663
libhiredis-dev \
57-
libnl-3-dev \
58-
libnl-genl-3-dev \
59-
libnl-route-3-dev \
60-
libnl-nf-3-dev \
6164
swig3.0
6265
sudo apt-get install -y libdbus-1-3
6366
sudo apt-get install -y libteam-dev \
@@ -82,7 +85,24 @@ jobs:
8285
runVersion: 'latestFromBranch'
8386
runBranch: 'refs/heads/master'
8487
displayName: "Download sonic sairedis deb packages"
88+
- task: DownloadPipelineArtifact@2
89+
inputs:
90+
source: specific
91+
project: build
92+
pipeline: ${{ parameters.buildimage_pipeline }}
93+
artifact: ${{ parameters.buildimage_artifact_name }}
94+
runVersion: 'latestFromBranch'
95+
runBranch: 'refs/heads/master'
96+
displayName: "Download sonic buildimage deb packages"
8597
- script: |
98+
sudo dpkg -i target/debs/buster/libnl-3-200_*.deb
99+
sudo dpkg -i target/debs/buster/libnl-3-dev_*.deb
100+
sudo dpkg -i target/debs/buster/libnl-genl-3-200_*.deb
101+
sudo dpkg -i target/debs/buster/libnl-genl-3-dev_*.deb
102+
sudo dpkg -i target/debs/buster/libnl-route-3-200_*.deb
103+
sudo dpkg -i target/debs/buster/libnl-route-3-dev_*.deb
104+
sudo dpkg -i target/debs/buster/libnl-nf-3-200_*.deb
105+
sudo dpkg -i target/debs/buster/libnl-nf-3-dev_*.deb
86106
sudo dpkg -i libswsscommon_1.0.0_${{ parameters.arch }}.deb
87107
sudo dpkg -i libswsscommon-dev_1.0.0_${{ parameters.arch }}.deb
88108
sudo dpkg -i libsaivs_*.deb
@@ -93,7 +113,7 @@ jobs:
93113
sudo dpkg -i libsaimetadata-dev_*.deb
94114
sudo dpkg -i syncd-vs_*.deb
95115
workingDirectory: $(Pipeline.Workspace)
96-
displayName: "Install sonic swss common and sairedis"
116+
displayName: "Install libnl3, sonic swss common and sairedis"
97117
- checkout: self
98118
submodules: true
99119
- script: |

azure-pipelines.yml

+6
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ stages:
1616
parameters:
1717
arch: amd64
1818
sonic_slave: sonic-slave-buster
19+
buildimage_artifact_name: sonic-buildimage.vs
20+
buildimage_pipeline: 1
1921
swss_common_artifact_name: sonic-swss-common
2022
sairedis_artifact_name: sonic-sairedis
2123
artifact_name: sonic-swss
@@ -31,6 +33,8 @@ stages:
3133
timeout: 240
3234
pool: sonicbld
3335
sonic_slave: sonic-slave-buster-armhf
36+
buildimage_artifact_name: sonic-buildimage.marvell-armhf
37+
buildimage_pipeline: 141
3438
swss_common_artifact_name: sonic-swss-common.armhf
3539
sairedis_artifact_name: sonic-sairedis.armhf
3640
artifact_name: sonic-swss.armhf
@@ -42,6 +46,8 @@ stages:
4246
pool: sonicbld
4347
sonic_slave: sonic-slave-buster-arm64
4448
swss_common_artifact_name: sonic-swss-common.arm64
49+
buildimage_artifact_name: sonic-buildimage.centec-arm64
50+
buildimage_pipeline: 140
4551
sairedis_artifact_name: sonic-sairedis.arm64
4652
artifact_name: sonic-swss.arm64
4753

0 commit comments

Comments
 (0)