From 208e80bd49a49073876a65ab8c01ac305c4dec87 Mon Sep 17 00:00:00 2001 From: Lawrence Lee Date: Tue, 23 May 2023 19:08:11 +0000 Subject: [PATCH] update azp to use public pipeline artifacts Signed-off-by: Lawrence Lee --- .../build-docker-sonic-vs-template.yml | 2 -- .azure-pipelines/build-template.yml | 2 -- azure-pipelines-dash.yml | 25 ++++++------------- 3 files changed, 7 insertions(+), 22 deletions(-) diff --git a/.azure-pipelines/build-docker-sonic-vs-template.yml b/.azure-pipelines/build-docker-sonic-vs-template.yml index f90594adcf..e34bac7d79 100644 --- a/.azure-pipelines/build-docker-sonic-vs-template.yml +++ b/.azure-pipelines/build-docker-sonic-vs-template.yml @@ -81,7 +81,6 @@ jobs: runVersion: 'latestFromBranch' runBranch: 'refs/heads/${{ parameters.swss_common_branch }}' path: $(Build.ArtifactStagingDirectory)/download - allowPartiallySucceededBuilds: true displayName: "Download sonic swss common deb packages" - task: DownloadPipelineArtifact@2 inputs: @@ -100,7 +99,6 @@ jobs: ${{ parameters.sairedis_artifact_pattern }}/libsaimetadata_*.deb ${{ parameters.sairedis_artifact_pattern }}/libsaimetadata-dev_*.deb ${{ parameters.sairedis_artifact_pattern }}/syncd-vs_*.deb - allowPartiallySucceededBuilds: true displayName: "Download sonic sairedis deb packages" - task: DownloadPipelineArtifact@2 inputs: diff --git a/.azure-pipelines/build-template.yml b/.azure-pipelines/build-template.yml index bc69ae26db..82bda4fd2b 100644 --- a/.azure-pipelines/build-template.yml +++ b/.azure-pipelines/build-template.yml @@ -115,7 +115,6 @@ jobs: runVersion: 'latestFromBranch' runBranch: 'refs/heads/${{ parameters.swss_common_branch }}' path: $(Build.ArtifactStagingDirectory)/download/swsscommon - allowPartiallySucceededBuilds: true patterns: | libswsscommon_1.0.0_${{ parameters.arch }}.deb libswsscommon-dev_1.0.0_${{ parameters.arch }}.deb @@ -129,7 +128,6 @@ jobs: runVersion: 'latestFromBranch' runBranch: 'refs/heads/${{ parameters.sairedis_artifact_branch }}' path: $(Build.ArtifactStagingDirectory)/download/sairedis - allowPartiallySucceededBuilds: true patterns: | ${{ parameters.sairedis_artifact_pattern }}/libsaivs_*.deb ${{ parameters.sairedis_artifact_pattern }}/libsaivs-dev_*.deb diff --git a/azure-pipelines-dash.yml b/azure-pipelines-dash.yml index 04a277a8f7..3e77d0b26e 100644 --- a/azure-pipelines-dash.yml +++ b/azure-pipelines-dash.yml @@ -40,15 +40,10 @@ stages: artifact_name: sonic-swss archive_pytests: true archive_gcov: true - sairedis_artifact_name: sonic-buildimage.vs - sairedis_artifact_project: nvidia - sairedis_artifact_pipeline: nvidia-sonic.sonic-buildimage - sairedis_artifact_branch: bluefield - sairedis_artifact_pattern: target/debs/bullseye - common_lib_artifact_name: sonic-buildimage.vs - common_lib_artifact_project: nvidia - common_lib_artifact_pipeline: nvidia-sonic.sonic-buildimage - common_lib_artifact_branch: bluefield + sairedis_artifact_name: sonic-sairedis + sairedis_artifact_branch: master + common_lib_artifact_name: common-lib + common_lib_artifact_branch: master - stage: BuildDocker @@ -57,19 +52,13 @@ stages: jobs: - template: .azure-pipelines/build-docker-sonic-vs-template.yml parameters: + buildimage_artifact_branch: master swss_common_artifact_name: sonic-swss-common swss_common_branch: master swss_artifact_name: sonic-swss artifact_name: docker-sonic-vs - buildimage_artifact_name: sonic-buildimage.vs - buildimage_artifact_project: nvidia - buildimage_artifact_pipeline: nvidia-sonic.sonic-buildimage - buildimage_artifact_branch: bluefield - sairedis_artifact_name: sonic-buildimage.vs - sairedis_artifact_project: nvidia - sairedis_artifact_pipeline: nvidia-sonic.sonic-buildimage - sairedis_artifact_branch: bluefield - sairedis_artifact_pattern: target/debs/bullseye + sairedis_artifact_name: sonic-sairedis + sairedis_artifact_branch: master - stage: Test dependsOn: BuildDocker