Skip to content

Commit d7b5ff7

Browse files
[ci] Use correct branch when downloading artifact. (#2292)
1 parent 2f13244 commit d7b5ff7

4 files changed

+15
-9
lines changed

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

+3-4
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
pipeline: 9
4040
artifact: ${{ parameters.swss_common_artifact_name }}
4141
runVersion: 'latestFromBranch'
42-
runBranch: 'refs/heads/master'
42+
runBranch: 'refs/heads/$(BUILD_BRANCH)'
4343
displayName: "Download sonic swss common deb packages"
4444
- task: DownloadPipelineArtifact@2
4545
inputs:
@@ -48,7 +48,7 @@ jobs:
4848
pipeline: 12
4949
artifact: ${{ parameters.sairedis_artifact_name }}
5050
runVersion: 'latestFromBranch'
51-
runBranch: 'refs/heads/master'
51+
runBranch: 'refs/heads/$(BUILD_BRANCH)'
5252
displayName: "Download sonic sairedis deb packages"
5353
- task: DownloadPipelineArtifact@2
5454
inputs:
@@ -61,13 +61,12 @@ jobs:
6161
pipeline: 1
6262
artifact: sonic-buildimage.vs
6363
runVersion: 'latestFromBranch'
64-
runBranch: 'refs/heads/master'
64+
runBranch: 'refs/heads/$(BUILD_BRANCH)'
6565
displayName: "Download sonic buildimage"
6666
- script: |
6767
echo $(Build.DefinitionName).$(Build.BuildNumber)
6868
6969
docker load < ../target/docker-sonic-vs.gz
70-
7170
mkdir -p .azure-pipelines/docker-sonic-vs/debs
7271
7372
cp -v ../*.deb .azure-pipelines/docker-sonic-vs/debs

.azure-pipelines/build-template.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
pool:
5555
${{ if ne(parameters.pool, 'default') }}:
5656
name: ${{ parameters.pool }}
57-
${{ if eq(parameters.pool, 'default') }}:
57+
${{ else }}:
5858
vmImage: 'ubuntu-20.04'
5959

6060
container:
@@ -82,7 +82,7 @@ jobs:
8282
pipeline: 9
8383
artifact: ${{ parameters.swss_common_artifact_name }}
8484
runVersion: 'latestFromBranch'
85-
runBranch: 'refs/heads/master'
85+
runBranch: 'refs/heads/$(BUILD_BRANCH)'
8686
path: '$(Build.SourcesDirectory)/${{ parameters.swss_common_artifact_name }}'
8787
displayName: "Download sonic swss common deb packages"
8888
- task: DownloadPipelineArtifact@2
@@ -92,7 +92,7 @@ jobs:
9292
pipeline: 12
9393
artifact: ${{ parameters.sairedis_artifact_name }}
9494
runVersion: 'latestFromBranch'
95-
runBranch: 'refs/heads/master'
95+
runBranch: 'refs/heads/$(BUILD_BRANCH)'
9696
path: '$(Build.SourcesDirectory)/${{ parameters.sairedis_artifact_name }}'
9797
displayName: "Download sonic sairedis deb packages"
9898
- task: DownloadPipelineArtifact@2
@@ -104,7 +104,7 @@ jobs:
104104
pipeline: ${{ parameters.buildimage_pipeline }}
105105
artifact: ${{ parameters.buildimage_artifact_name }}
106106
runVersion: 'latestFromBranch'
107-
runBranch: 'refs/heads/master'
107+
runBranch: 'refs/heads/$(BUILD_BRANCH)'
108108
path: '$(Build.SourcesDirectory)/${{ parameters.buildimage_artifact_name }}'
109109
displayName: "Download sonic buildimage deb packages"
110110
- script: |

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
pipeline: 9
4141
artifact: sonic-swss-common.amd64.ubuntu20_04
4242
runVersion: 'latestFromBranch'
43-
runBranch: 'refs/heads/master'
43+
runBranch: 'refs/heads/$(BUILD_BRANCH)'
4444
displayName: "Download sonic swss common deb packages"
4545

4646
- script: |

azure-pipelines.yml

+7
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,13 @@ schedules:
2727
- 201???
2828
always: true
2929

30+
variables:
31+
- name: BUILD_BRANCH
32+
${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
33+
value: $(System.PullRequest.TargetBranch)
34+
${{ else }}:
35+
value: $(Build.SourceBranchName)
36+
3037
stages:
3138
- stage: Build
3239

0 commit comments

Comments
 (0)