Skip to content

Commit

Permalink
[fpmsyncd][MPLS] updates for MPLS plus AZP libnl3 install (sonic-net#…
Browse files Browse the repository at this point in the history
…1871)

* "fpmsyncd support" for routes with AF_MPLS and NHs with MPLS attributes.
* AZP changes to install libnl3 from sonic-buildimage
  • Loading branch information
qbdwlr authored and raphaelt-nvidia committed Oct 5, 2021
1 parent b57207b commit 0e4b32a
Show file tree
Hide file tree
Showing 5 changed files with 291 additions and 24 deletions.
30 changes: 25 additions & 5 deletions .azure-pipelines/build-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,13 @@ parameters:
- name: sonic_slave
type: string

- name: buildimage_artifact_name
type: string

- name: buildimage_pipeline
type: number
default: 1

- name: sairedis_artifact_name
type: string

Expand Down Expand Up @@ -54,10 +61,6 @@ jobs:
sudo apt-get install -y libzmq5 libzmq3-dev
sudo apt-get install -qq -y \
libhiredis-dev \
libnl-3-dev \
libnl-genl-3-dev \
libnl-route-3-dev \
libnl-nf-3-dev \
swig3.0
sudo apt-get install -y libdbus-1-3
sudo apt-get install -y libteam-dev \
Expand All @@ -82,7 +85,24 @@ jobs:
runVersion: 'latestFromBranch'
runBranch: 'refs/heads/master'
displayName: "Download sonic sairedis deb packages"
- task: DownloadPipelineArtifact@2
inputs:
source: specific
project: build
pipeline: ${{ parameters.buildimage_pipeline }}
artifact: ${{ parameters.buildimage_artifact_name }}
runVersion: 'latestFromBranch'
runBranch: 'refs/heads/master'
displayName: "Download sonic buildimage deb packages"
- script: |
sudo dpkg -i target/debs/buster/libnl-3-200_*.deb
sudo dpkg -i target/debs/buster/libnl-3-dev_*.deb
sudo dpkg -i target/debs/buster/libnl-genl-3-200_*.deb
sudo dpkg -i target/debs/buster/libnl-genl-3-dev_*.deb
sudo dpkg -i target/debs/buster/libnl-route-3-200_*.deb
sudo dpkg -i target/debs/buster/libnl-route-3-dev_*.deb
sudo dpkg -i target/debs/buster/libnl-nf-3-200_*.deb
sudo dpkg -i target/debs/buster/libnl-nf-3-dev_*.deb
sudo dpkg -i libswsscommon_1.0.0_${{ parameters.arch }}.deb
sudo dpkg -i libswsscommon-dev_1.0.0_${{ parameters.arch }}.deb
sudo dpkg -i libsaivs_*.deb
Expand All @@ -93,7 +113,7 @@ jobs:
sudo dpkg -i libsaimetadata-dev_*.deb
sudo dpkg -i syncd-vs_*.deb
workingDirectory: $(Pipeline.Workspace)
displayName: "Install sonic swss common and sairedis"
displayName: "Install libnl3, sonic swss common and sairedis"
- checkout: self
submodules: true
- script: |
Expand Down
6 changes: 6 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ stages:
parameters:
arch: amd64
sonic_slave: sonic-slave-buster
buildimage_artifact_name: sonic-buildimage.vs
buildimage_pipeline: 1
swss_common_artifact_name: sonic-swss-common
sairedis_artifact_name: sonic-sairedis
artifact_name: sonic-swss
Expand All @@ -31,6 +33,8 @@ stages:
timeout: 240
pool: sonicbld
sonic_slave: sonic-slave-buster-armhf
buildimage_artifact_name: sonic-buildimage.marvell-armhf
buildimage_pipeline: 141
swss_common_artifact_name: sonic-swss-common.armhf
sairedis_artifact_name: sonic-sairedis.armhf
artifact_name: sonic-swss.armhf
Expand All @@ -42,6 +46,8 @@ stages:
pool: sonicbld
sonic_slave: sonic-slave-buster-arm64
swss_common_artifact_name: sonic-swss-common.arm64
buildimage_artifact_name: sonic-buildimage.centec-arm64
buildimage_pipeline: 140
sairedis_artifact_name: sonic-sairedis.arm64
artifact_name: sonic-swss.arm64

Expand Down
Loading

0 comments on commit 0e4b32a

Please sign in to comment.