[azp] Use consistent library set

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>

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

@@ -14,12 +14,6 @@ parameters:
 - name: swss_artifact_name
   type: string
 
-- name: sairedis_artifact_name
-  type: string
-
-- name: swss_common_artifact_name
-  type: string
-
 - name: artifact_name
   type: string
 
@@ -32,37 +26,12 @@ jobs:
     vmImage: 'ubuntu-20.04'
 
   steps:
-  - task: DownloadPipelineArtifact@2
-    inputs:
-      source: specific
-      project: build
-      pipeline: 9
-      artifact: ${{ parameters.swss_common_artifact_name }}
-      runVersion: 'latestFromBranch'
-      runBranch: 'refs/heads/master'
-    displayName: "Download sonic swss common deb packages"
-  - task: DownloadPipelineArtifact@2
-    inputs:
-      source: specific
-      project: build
-      pipeline: 12
-      artifact: ${{ parameters.sairedis_artifact_name }}
-      runVersion: 'latestFromBranch'
-      runBranch: 'refs/heads/master'
-    displayName: "Download sonic sairedis deb packages"
+
   - task: DownloadPipelineArtifact@2
     inputs:
       artifact: ${{ parameters.swss_artifact_name }}
     displayName: "Download sonic swss artifact"
-  - task: DownloadPipelineArtifact@2
-    inputs:
-      source: specific
-      project: build
-      pipeline: 1
-      artifact: sonic-buildimage.vs
-      runVersion: 'latestFromBranch'
-      runBranch: 'refs/heads/master'
-    displayName: "Download sonic buildimage"
+
   - script: |
       echo $(Build.DefinitionName).$(Build.BuildNumber)
 

.azure-pipelines/build-template.yml

@@ -29,12 +29,6 @@ parameters:
 - name: buildimage_pipeline
   type: number
 
-- name: sairedis_artifact_name
-  type: string
-
-- name: swss_common_artifact_name
-  type: string
-
 - name: artifact_name
   type: string
 
@@ -75,26 +69,6 @@ jobs:
           libteam5 \
           libteamdctl0
     displayName: "Install dependencies"
-  - task: DownloadPipelineArtifact@2
-    inputs:
-      source: specific
-      project: build
-      pipeline: 9
-      artifact: ${{ parameters.swss_common_artifact_name }}
-      runVersion: 'latestFromBranch'
-      runBranch: 'refs/heads/master'
-      path: '$(Build.SourcesDirectory)/${{ parameters.swss_common_artifact_name }}'
-    displayName: "Download sonic swss common deb packages"
-  - task: DownloadPipelineArtifact@2
-    inputs:
-      source: specific
-      project: build
-      pipeline: 12
-      artifact: ${{ parameters.sairedis_artifact_name }}
-      runVersion: 'latestFromBranch'
-      runBranch: 'refs/heads/master'
-      path: '$(Build.SourcesDirectory)/${{ parameters.sairedis_artifact_name }}'
-    displayName: "Download sonic sairedis deb packages"
   - task: DownloadPipelineArtifact@2
     ${{ if eq(parameters.buildimage_pipeline, 141) }}:
       continueOnError: True
@@ -126,19 +100,17 @@ jobs:
       path: '$(Build.SourcesDirectory)/${{ parameters.buildimage_artifact_name }}'
     displayName: "Download sonic buildimage deb packages from 63911"
   - script: |
-      cd $(Build.SourcesDirectory)/${{ parameters.buildimage_artifact_name }}
-      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
-      cd $(Build.SourcesDirectory)/${{ parameters.swss_common_artifact_name }}
+      cd $(Build.SourcesDirectory)/${{ parameters.buildimage_artifact_name }}/target/debs/buster
+      sudo dpkg -i libnl-3-200_*.deb
+      sudo dpkg -i libnl-3-dev_*.deb
+      sudo dpkg -i libnl-genl-3-200_*.deb
+      sudo dpkg -i libnl-genl-3-dev_*.deb
+      sudo dpkg -i libnl-route-3-200_*.deb
+      sudo dpkg -i libnl-route-3-dev_*.deb
+      sudo dpkg -i libnl-nf-3-200_*.deb
+      sudo dpkg -i 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
-      cd $(Build.SourcesDirectory)/${{ parameters.sairedis_artifact_name }}
       sudo dpkg -i libsaivs_*.deb
       sudo dpkg -i libsaivs-dev_*.deb
       sudo dpkg -i libsairedis_*.deb
@@ -158,10 +130,10 @@ jobs:
       ./autogen.sh
       dpkg-buildpackage -us -uc -b -j$(nproc) && cp ../*.deb .
     displayName: "Compile sonic swss"
-  - publish: $(System.DefaultWorkingDirectory)/
+  - publish: $(Build.SourcesDirectory)/${{ parameters.buildimage_artifact_name }}/target/debs/buster
     artifact: ${{ parameters.artifact_name }}
     displayName: "Archive swss debian packages"
   - publish: $(Build.ArtifactStagingDirectory)/
     artifact: sonic-swss-pytests
     displayName: "Archive swss pytests"
-    condition: eq('${{ parameters.archive_pytests }}', true)
+    condition: eq('${{ parameters.archive_pytests }}', true)

.azure-pipelines/gcov.yml

@@ -19,15 +19,6 @@ parameters:
 - name: sonic_slave
   type: string
 
-- name: sairedis_artifact_name
-  type: string
-
-- name: swss_common_artifact_name
-  type: string
-
-- name: swss_artifact_name
-  type: string
-
 - name: artifact_name
   type: string
 

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

@@ -9,9 +9,6 @@ parameters:
 - name: gcov_artifact_name
   type: string
 
-- name: sonic_slave
-  type: string
-
 - name: archive_gcov
   type: boolean
   default: false

azure-pipelines.yml

@@ -18,9 +18,7 @@ stages:
       sonic_slave: sonic-slave-buster
       buildimage_artifact_name: sonic-buildimage.vs
       buildimage_pipeline: 142
-      swss_common_artifact_name: sonic-swss-common
-      sairedis_artifact_name: sonic-sairedis
-      artifact_name: sonic-swss
+      artifact_name: sonic-debs
       archive_pytests: true
       archive_gcov: true
 
@@ -36,8 +34,6 @@ stages:
       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
       archive_gcov: false
 
@@ -47,10 +43,8 @@ stages:
       timeout: 240
       pool: sonicbld-arm64
       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
       archive_gcov: false
 
@@ -60,9 +54,7 @@ stages:
   jobs:
   - template: .azure-pipelines/build-docker-sonic-vs-template.yml
     parameters:
-      swss_common_artifact_name: sonic-swss-common
-      sairedis_artifact_name: sonic-sairedis
-      swss_artifact_name: sonic-swss
+      swss_artifact_name: sonic-debs
       artifact_name: docker-sonic-vs
 
 - stage: Test
@@ -71,9 +63,9 @@ stages:
   jobs:
   - template: .azure-pipelines/test-docker-sonic-vs-template.yml
     parameters:
+      swss_artifact_name: sonic-debs
       log_artifact_name: log
       gcov_artifact_name: sonic-gcov
-      sonic_slave: sonic-slave-buster
       archive_gcov: true
 
 - stage: Gcov
@@ -84,8 +76,5 @@ stages:
     parameters:
       arch: amd64
       sonic_slave: sonic-slave-buster
-      swss_common_artifact_name: sonic-swss-common
-      sairedis_artifact_name: sonic-sairedis
-      swss_artifact_name: sonic-swss
       artifact_name: sonic-gcov
       archive_gcov: true