Skip to content

[ci] Fix remove sonic-slave docker image issue #10296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
liushilongbuaa merged 1 commit into from
Mar 22, 2022
Merged

[ci] Fix remove sonic-slave docker image issue #10296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions .azure-pipelines/azure-pipelines-UpgrateVersion.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,7 @@ stages:
jobFilters: ${{ parameters.jobFilters }}
buildOptions: '${{ variables.VERSION_CONTROL_OPTIONS }} SONIC_BUILD_JOBS=$(nproc) ENABLE_IMAGE_SIGNATURE=y'
preSteps:
- script: |
containers=$(docker container ls | grep "sonic-slave" | awk '{ print $1 }')
if [ ! -z "$containers" ]; then
docker container kill $containers || true
sleep 5
fi
images=$(docker images 'sonic-slave-*' -a -q)
if [ ! -z "$images" ]; then
docker rmi -f $images
fi
displayName: 'Cleanup sonic slave'
- template: template-clean-sonic-slave.yml
- stage: UpgradeVersions
jobs:
- job: UpgradeVersions
Expand Down
11 changes: 1 addition & 10 deletions .azure-pipelines/docker-sonic-slave-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ jobs:
pool: ${{ parameters.pool }}
steps:
- template: cleanup.yml
- template: template-clean-sonic-slave.yml
- checkout: self
clean: true
submodules: recursive
Expand Down Expand Up @@ -68,16 +69,6 @@ jobs:
BUILD_OPTIONS = 'SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web,git,docker'
fi

containers=$(docker container ls | grep "sonic-slave" | awk '{ print $1 }')
if [ ! -z "$containers" ]; then
docker container kill $containers || true
sleep 5
fi
images=$(docker images 'sonic-slave-*' -a -q)
if [ ! -z "$images" ]; then
docker rmi -f $images
fi

tmpfile=$(mktemp)

echo ${{ parameters.arch }} > .arch
Expand Down
8 changes: 8 additions & 0 deletions .azure-pipelines/template-clean-sonic-slave.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
steps:
- script: |
containers=$(docker container ls -a | grep "sonic-slave" | awk '{ print $1 }')
[ -n "$containers" ] && docker container rm -f containers
docker images | grep "^<none>" | awk '{print$3}' | xargs -i docker rmi {}
images=$(docker images 'sonic-slave-*' -a -q)
[ -n "$images" ] && docker rmi -f $images
displayName: 'Cleanup sonic slave'