[fpmsyncd] updates for MPLS plus AZP libnl3 install

sonic-net · Aug 12, 2021 · 3ea4a94 · 3ea4a94
1 parent c805021
commit 3ea4a94
Show file tree

Hide file tree

Showing 5 changed files with 291 additions and 25 deletions.
diff --git a/.azure-pipelines/build-template.yml b/.azure-pipelines/build-template.yml
@@ -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
 
@@ -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 \
@@ -82,7 +85,25 @@ 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 }}
+      artifacts: ${{ parameters.buildimage_artifact_name }}
+      runVersion: 'latestFromBranch'
+      runBranch: 'refs/heads/master'
+    displayName: "Download sonic buildimage deb packages"
   - script: |
+      ls -l
+      sudo dpkg -i ${{ parameters.buildimage_artifact_name }}/target/debs/buster/libnl-3-200_*.deb
+      sudo dpkg -i ${{ parameters.buildimage_artifact_name }}/target/debs/buster/libnl-3-dev_*.deb
+      sudo dpkg -i ${{ parameters.buildimage_artifact_name }}/target/debs/buster/libnl-genl-3-200_*.deb
+      sudo dpkg -i ${{ parameters.buildimage_artifact_name }}/target/debs/buster/libnl-genl-3-dev_*.deb
+      sudo dpkg -i ${{ parameters.buildimage_artifact_name }}/target/debs/buster/libnl-route-3-200_*.deb
+      sudo dpkg -i ${{ parameters.buildimage_artifact_name }}/target/debs/buster/libnl-route-3-dev_*.deb
+      sudo dpkg -i ${{ parameters.buildimage_artifact_name }}/target/debs/buster/libnl-nf-3-200_*.deb
+      sudo dpkg -i ${{ parameters.buildimage_artifact_name }}/target/debs/buster/libnl-nf-3-dev_*.deb
       sudo dpkg -i ${{ parameters.swss_common_artifact_name }}/libswsscommon_1.0.0_${{ parameters.arch }}.deb
       sudo dpkg -i ${{ parameters.swss_common_artifact_name }}/libswsscommon-dev_1.0.0_${{ parameters.arch }}.deb
       sudo dpkg -i ${{ parameters.sairedis_artifact_name }}/libsaivs_*.deb
@@ -93,7 +114,7 @@ jobs:
       sudo dpkg -i ${{ parameters.sairedis_artifact_name }}/libsaimetadata-dev_*.deb
       sudo dpkg -i ${{ parameters.sairedis_artifact_name }}/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: |

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -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
@@ -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
@@ -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