From 5d63cb4b5dc1d65438a76070f358fc13a6a3eb24 Mon Sep 17 00:00:00 2001 From: Liu Shilong Date: Mon, 20 Mar 2023 12:21:39 +0800 Subject: [PATCH 1/2] [ci] Allow partially succeeded builds to download. (#2709) (cherry picked from commit c5fa616bde68d39e24445add0d5350b09a21bd92) Signed-off-by: Prabhat Aravind --- .azure-pipelines/build-docker-sonic-vs-template.yml | 2 ++ .azure-pipelines/build-template.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.azure-pipelines/build-docker-sonic-vs-template.yml b/.azure-pipelines/build-docker-sonic-vs-template.yml index ff0ff6c0cb..a37329f2ec 100644 --- a/.azure-pipelines/build-docker-sonic-vs-template.yml +++ b/.azure-pipelines/build-docker-sonic-vs-template.yml @@ -41,6 +41,7 @@ jobs: runVersion: 'latestFromBranch' runBranch: 'refs/heads/$(BUILD_BRANCH)' path: $(Build.ArtifactStagingDirectory)/download + allowPartiallySucceededBuilds: true displayName: "Download sonic swss common deb packages" - task: DownloadPipelineArtifact@2 inputs: @@ -51,6 +52,7 @@ jobs: runVersion: 'latestFromBranch' runBranch: 'refs/heads/$(BUILD_BRANCH)' path: $(Build.ArtifactStagingDirectory)/download + 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 012bc91c5d..8a972630a6 100644 --- a/.azure-pipelines/build-template.yml +++ b/.azure-pipelines/build-template.yml @@ -83,6 +83,7 @@ jobs: runVersion: 'latestFromBranch' runBranch: 'refs/heads/$(BUILD_BRANCH)' path: $(Build.ArtifactStagingDirectory)/download + allowPartiallySucceededBuilds: true patterns: | libswsscommon_1.0.0_${{ parameters.arch }}.deb libswsscommon-dev_1.0.0_${{ parameters.arch }}.deb @@ -96,6 +97,7 @@ jobs: runVersion: 'latestFromBranch' runBranch: 'refs/heads/$(BUILD_BRANCH)' path: $(Build.ArtifactStagingDirectory)/download + allowPartiallySucceededBuilds: true patterns: | libsaivs_*.deb libsaivs-dev_*.deb From e4524fa4efc680c55fde5f8aad5fa68e4f13a3b4 Mon Sep 17 00:00:00 2001 From: Liu Shilong Date: Wed, 10 May 2023 02:44:45 +0800 Subject: [PATCH 2/2] Fix pipeline issue caused by urllib3 v2 * Fix pipeline issue caused by urllib3 v2 (cherry picked from commit 02988e8b10c17c8a500c8fb1972614f4de61120b) Signed-off-by: Prabhat Aravind --- .azure-pipelines/test-docker-sonic-vs-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines/test-docker-sonic-vs-template.yml b/.azure-pipelines/test-docker-sonic-vs-template.yml index acb6755f64..3e39d645e5 100644 --- a/.azure-pipelines/test-docker-sonic-vs-template.yml +++ b/.azure-pipelines/test-docker-sonic-vs-template.yml @@ -45,7 +45,7 @@ jobs: # install packages for vs test sudo apt-get install -y net-tools bridge-utils vlan sudo apt-get install -y python3-pip - sudo pip3 install pytest==4.6.2 attrs==19.1.0 exabgp==4.0.10 distro==1.5.0 docker==4.4.1 redis==3.3.4 flaky==3.7.0 + sudo pip3 install pytest==4.6.2 attrs==19.1.0 exabgp==4.0.10 distro==1.5.0 docker>=4.4.1 redis==3.3.4 flaky==3.7.0 displayName: "Install dependencies" - script: |