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

Fix sonic slave pipeline to set correct tag on sonic slave image. (#13177)

Browse Source 
Why I did it
Currently sonic-slave-* tag is confusing. Set correct tag on sonic-slave-* image.
Fix job name to fit the build.

How I did it
build amd image in amd64:
sonic-slave-bullseye:cfe29bff67c
sonic-slave-bullseye:latest
sonic-slave-bullseye:master

build armhf image in amd64:
sonic-slave-bullseye-march-armhf:33614806dc3
sonic-slave-bullseye-march-armhf:latest
sonic-slave-bullseye-march-armhf:master

build arm64 image in amd64:
sonic-slave-bullseye-march-arm64:f3b1b16c801
sonic-slave-bullseye-march-arm64:latest
sonic-slave-bullseye-march-arm64:master

build arm64 image in arm64:
sonic-slave-bullseye:75cb326c9a7
sonic-slave-bullseye-arm64:latest
sonic-slave-bullseye:master

build armhf image in armhf:
sonic-slave-bullseye:64d178951fc
sonic-slave-bullseye-armhf:latest
sonic-slave-bullseye:master

How to verify it
This commit is contained in:
Liu Shilong 2022-12-27 15:40:15 +08:00 committed by GitHub
parent 661669c805
commit 550cd6649f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,7 +35,7 @@ parameters:
- sonicbld-armhf - sonicbld-armhf
jobs: jobs:
- job: Build_${{ parameters.dist }}_${{ parameters.march }}${{ parameters.arch }} - job: sonic_slave_${{ parameters.dist }}${{ parameters.march }}
timeoutInMinutes: 360 timeoutInMinutes: 360
variables: variables:
- template: /.azure-pipelines/template-variables.yml@buildimage - template: /.azure-pipelines/template-variables.yml@buildimage
@ -46,7 +46,6 @@ jobs:
- template: /.azure-pipelines/template-clean-sonic-slave.yml@buildimage - template: /.azure-pipelines/template-clean-sonic-slave.yml@buildimage
- checkout: self - checkout: self
clean: true clean: true
submodules: recursive
- task: Docker@2 - task: Docker@2
displayName: Login to ACR displayName: Login to ACR
inputs: inputs:
@ -56,6 +55,9 @@ jobs:
set -ex set -ex
image_tag=$(BLDENV=${{ parameters.dist }} make -f Makefile.work showtag PLATFORM=generic PLATFORM_ARCH=${{ parameters.arch }} | grep sonic-slave | tail -n 1) image_tag=$(BLDENV=${{ parameters.dist }} make -f Makefile.work showtag PLATFORM=generic PLATFORM_ARCH=${{ parameters.arch }} | grep sonic-slave | tail -n 1)
image_latest=$(echo $(echo $image_tag | awk -F: '{print$1}'):latest) image_latest=$(echo $(echo $image_tag | awk -F: '{print$1}'):latest)
if echo ${{ parameters.pool }} | grep ${{ parameters.arch }};then
image_latest=$(echo ${image_latest} | sed 's/:/-${{ parameters.arch }}:/')
fi
image_branch=$(echo $(echo $image_tag | awk -F: '{print$1}'):$(Build.SourceBranchName)) image_branch=$(echo $(echo $image_tag | awk -F: '{print$1}'):$(Build.SourceBranchName))
docker rmi $image_tag || true docker rmi $image_tag || true
@ -72,7 +74,7 @@ jobs:
docker push ${REGISTRY_SERVER}/${image_tag} docker push ${REGISTRY_SERVER}/${image_tag}
docker tag ${image_tag} ${REGISTRY_SERVER}/${image_branch} docker tag ${image_tag} ${REGISTRY_SERVER}/${image_branch}
docker push ${REGISTRY_SERVER}/${image_branch} docker push ${REGISTRY_SERVER}/${image_branch}
if [[ "${{ parameters.arch }}" == "amd64" ]] && [[ "$(Build.SourceBranchName)" == "master" ]];then if [[ "$(Build.SourceBranchName)" == "master" ]];then
docker tag ${image_tag} ${REGISTRY_SERVER}/${image_latest} docker tag ${image_tag} ${REGISTRY_SERVER}/${image_latest}
docker push ${REGISTRY_SERVER}/${image_latest} docker push ${REGISTRY_SERVER}/${image_latest}
fi fi

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

@ -56,7 +56,7 @@ parameters:
default: sonicdev default: sonicdev
stages: stages:
- stage: Build - stage: Build_in_amd64
jobs: jobs:
- ${{ each dist in parameters.dists }}: - ${{ each dist in parameters.dists }}:
- ${{ if endswith(variables['Build.DefinitionName'], dist) }}: - ${{ if endswith(variables['Build.DefinitionName'], dist) }}:
@ -66,7 +66,9 @@ stages:
pool: sonicbld pool: sonicbld
arch: ${{ arch }} arch: ${{ arch }}
dist: ${{ dist }} dist: ${{ dist }}
- stage: Build_march ${{ if ne(arch, 'amd64') }}:
march: _march_${{ arch }}
- stage: Build_native_arm
dependsOn: [] dependsOn: []
jobs: jobs:
- ${{ each dist in parameters.dists }}: - ${{ each dist in parameters.dists }}:
@ -78,4 +80,4 @@ stages:
pool: sonicbld-${{ arch }} pool: sonicbld-${{ arch }}
arch: ${{ arch }} arch: ${{ arch }}
dist: ${{ dist }} dist: ${{ dist }}
march: march_ march: _${{ arch }}