matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Ci]: Fix the docker slave azp template issue (#10453)

Browse Source 
Why I did it
[Ci]: Fix the docker slave azp template issue
This commit is contained in:
xumia 2022-04-06 11:34:02 +08:00 committed by GitHub
parent bfe5835650
commit 3391969d2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.azure-pipelines/docker-sonic-slave-template.yml
View File

@ -40,7 +40,7 @@ jobs:
- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
- template: template-clean-sonic-slave.yml - template: template-clean-sonic-slave.yml
- ${{ else }}: - ${{ else }}:
- template: .azure-pipelines/template-variables.yml@buildimage - template: '/.azure-pipelines/template-clean-sonic-slave.yml@buildimage'
- checkout: self - checkout: self
clean: true clean: true
submodules: recursive submodules: recursive
@ -103,7 +103,8 @@ jobs:
command: push command: push
tags: | tags: |
$(VARIABLE_SLAVE_BASE_TAG) $(VARIABLE_SLAVE_BASE_TAG)
latest ${{ if eq(variables['Build.SourceBranchName'], 'master') }}:
latest
- ${{ if ne(parameters.arch, 'amd64') }}: - ${{ if ne(parameters.arch, 'amd64') }}:
- task: Docker@2 - task: Docker@2
condition: ne(variables['Build.Reason'], 'PullRequest') condition: ne(variables['Build.Reason'], 'PullRequest')

2
.azure-pipelines/docker-sonic-slave.yml
View File

@ -67,7 +67,7 @@ stages:
arch: ${{ arch }} arch: ${{ arch }}
dist: ${{ dist }} dist: ${{ dist }}
- ${{ else }}: - ${{ else }}:
- template: .azure-pipelines/docker-sonic-slave-template.yml@buildimage - template: '/.azure-pipelines/docker-sonic-slave-template.yml@buildimage'
parameters: parameters:
pool: sonicbld pool: sonicbld
arch: ${{ arch }} arch: ${{ arch }}