From e5f280b22d1033109871079edc4fdecfe17a587a Mon Sep 17 00:00:00 2001 From: Qi Luo Date: Sun, 23 Jan 2022 21:30:27 +0000 Subject: [PATCH 1/4] Use 202106 branches in azure pipeline --- .azure-pipelines/build-docker-sonic-vs-template.yml | 4 ++-- .azure-pipelines/build-swss-template.yml | 2 +- .azure-pipelines/build-template.yml | 2 +- .azure-pipelines/test-docker-sonic-vs-template.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.azure-pipelines/build-docker-sonic-vs-template.yml b/.azure-pipelines/build-docker-sonic-vs-template.yml index e751694c8..00e0ee3b5 100644 --- a/.azure-pipelines/build-docker-sonic-vs-template.yml +++ b/.azure-pipelines/build-docker-sonic-vs-template.yml @@ -39,7 +39,7 @@ jobs: pipeline: 9 artifact: ${{ parameters.swss_common_artifact_name }} runVersion: 'latestFromBranch' - runBranch: 'refs/heads/master' + runBranch: 'refs/heads/202106' displayName: "Download sonic swss common deb packages" - task: DownloadPipelineArtifact@2 inputs: @@ -56,7 +56,7 @@ jobs: pipeline: 1 artifact: sonic-buildimage.vs runVersion: 'latestFromBranch' - runBranch: 'refs/heads/master' + runBranch: 'refs/heads/202106' displayName: "Download sonic buildimage" - script: | echo $(Build.DefinitionName).$(Build.BuildNumber) diff --git a/.azure-pipelines/build-swss-template.yml b/.azure-pipelines/build-swss-template.yml index 9a0098c43..e68460bb1 100644 --- a/.azure-pipelines/build-swss-template.yml +++ b/.azure-pipelines/build-swss-template.yml @@ -67,7 +67,7 @@ jobs: pipeline: 9 artifact: ${{ parameters.swss_common_artifact_name }} runVersion: 'latestFromBranch' - runBranch: 'refs/heads/master' + runBranch: 'refs/heads/202106' displayName: "Download sonic swss common deb packages" - task: DownloadPipelineArtifact@2 inputs: diff --git a/.azure-pipelines/build-template.yml b/.azure-pipelines/build-template.yml index e4a179679..8e42b4787 100644 --- a/.azure-pipelines/build-template.yml +++ b/.azure-pipelines/build-template.yml @@ -85,7 +85,7 @@ jobs: pipeline: 9 artifact: ${{ parameters.swss_common_artifact_name }} runVersion: 'latestFromBranch' - runBranch: 'refs/heads/master' + runBranch: 'refs/heads/202106' displayName: "Download sonic swss common deb packages" - script: | sudo dpkg -i libswsscommon_1.0.0_${{ parameters.arch }}.deb diff --git a/.azure-pipelines/test-docker-sonic-vs-template.yml b/.azure-pipelines/test-docker-sonic-vs-template.yml index b0a22c86c..85bf84ae3 100644 --- a/.azure-pipelines/test-docker-sonic-vs-template.yml +++ b/.azure-pipelines/test-docker-sonic-vs-template.yml @@ -27,7 +27,7 @@ jobs: pipeline: 9 artifact: sonic-swss-common.amd64.ubuntu20_04 runVersion: 'latestFromBranch' - runBranch: 'refs/heads/master' + runBranch: 'refs/heads/202106' displayName: "Download sonic swss common deb packages" - checkout: self From da1d38f894d2539248547449586dfa0616c4ef6f Mon Sep 17 00:00:00 2001 From: Qi Luo Date: Sun, 23 Jan 2022 21:35:44 +0000 Subject: [PATCH 2/4] Allow download sonic-swss-common.amd64.ubuntu20_04 from failed or partially failed builds --- .azure-pipelines/build-docker-sonic-vs-template.yml | 2 ++ .azure-pipelines/build-swss-template.yml | 2 ++ .azure-pipelines/build-template.yml | 2 ++ .azure-pipelines/test-docker-sonic-vs-template.yml | 2 ++ 4 files changed, 8 insertions(+) diff --git a/.azure-pipelines/build-docker-sonic-vs-template.yml b/.azure-pipelines/build-docker-sonic-vs-template.yml index 00e0ee3b5..5e9030f31 100644 --- a/.azure-pipelines/build-docker-sonic-vs-template.yml +++ b/.azure-pipelines/build-docker-sonic-vs-template.yml @@ -40,6 +40,8 @@ jobs: artifact: ${{ parameters.swss_common_artifact_name }} runVersion: 'latestFromBranch' runBranch: 'refs/heads/202106' + allowPartiallySucceededBuilds: true + allowFailedBuilds: true displayName: "Download sonic swss common deb packages" - task: DownloadPipelineArtifact@2 inputs: diff --git a/.azure-pipelines/build-swss-template.yml b/.azure-pipelines/build-swss-template.yml index e68460bb1..7b5cbdfc1 100644 --- a/.azure-pipelines/build-swss-template.yml +++ b/.azure-pipelines/build-swss-template.yml @@ -68,6 +68,8 @@ jobs: artifact: ${{ parameters.swss_common_artifact_name }} runVersion: 'latestFromBranch' runBranch: 'refs/heads/202106' + allowPartiallySucceededBuilds: true + allowFailedBuilds: true displayName: "Download sonic swss common deb packages" - task: DownloadPipelineArtifact@2 inputs: diff --git a/.azure-pipelines/build-template.yml b/.azure-pipelines/build-template.yml index 8e42b4787..ce09c4160 100644 --- a/.azure-pipelines/build-template.yml +++ b/.azure-pipelines/build-template.yml @@ -86,6 +86,8 @@ jobs: artifact: ${{ parameters.swss_common_artifact_name }} runVersion: 'latestFromBranch' runBranch: 'refs/heads/202106' + allowPartiallySucceededBuilds: true + allowFailedBuilds: true displayName: "Download sonic swss common deb packages" - script: | sudo dpkg -i libswsscommon_1.0.0_${{ parameters.arch }}.deb diff --git a/.azure-pipelines/test-docker-sonic-vs-template.yml b/.azure-pipelines/test-docker-sonic-vs-template.yml index 85bf84ae3..251644ba0 100644 --- a/.azure-pipelines/test-docker-sonic-vs-template.yml +++ b/.azure-pipelines/test-docker-sonic-vs-template.yml @@ -28,6 +28,8 @@ jobs: artifact: sonic-swss-common.amd64.ubuntu20_04 runVersion: 'latestFromBranch' runBranch: 'refs/heads/202106' + allowPartiallySucceededBuilds: true + allowFailedBuilds: true displayName: "Download sonic swss common deb packages" - checkout: self From 2d4f8ee830aaf8bed49e90954f9579b8cf5ae2a6 Mon Sep 17 00:00:00 2001 From: Qi Luo Date: Mon, 24 Jan 2022 01:58:58 +0000 Subject: [PATCH 3/4] Use 202106 branch of swss --- azure-pipelines.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a786b0997..7e35b3c29 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -12,6 +12,7 @@ resources: repositories: - repository: sonic-swss type: github + ref: refs/heads/202106 name: Azure/sonic-swss endpoint: build From 44bce79fdc5b71868c1fad52253cc18e8326814e Mon Sep 17 00:00:00 2001 From: Qi Luo Date: Mon, 24 Jan 2022 06:17:23 +0000 Subject: [PATCH 4/4] Use Azure.sonic-buildimage.official.vs pipeline to download vs artifact --- .azure-pipelines/build-docker-sonic-vs-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines/build-docker-sonic-vs-template.yml b/.azure-pipelines/build-docker-sonic-vs-template.yml index 5e9030f31..e07cf5f09 100644 --- a/.azure-pipelines/build-docker-sonic-vs-template.yml +++ b/.azure-pipelines/build-docker-sonic-vs-template.yml @@ -55,7 +55,7 @@ jobs: inputs: source: specific project: build - pipeline: 1 + pipeline: 142 artifact: sonic-buildimage.vs runVersion: 'latestFromBranch' runBranch: 'refs/heads/202106'