mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Jenkinsfile: move integration step cleanup to amd64 where it was intended to be
Signed-off-by: Tibor Vass <tibor@docker.com>
This commit is contained in:
parent
ef89d70aed
commit
f3d8b8ae74
1 changed files with 2 additions and 3 deletions
5
Jenkinsfile
vendored
5
Jenkinsfile
vendored
|
@ -332,7 +332,8 @@ pipeline {
|
||||||
always {
|
always {
|
||||||
sh '''
|
sh '''
|
||||||
echo "Ensuring container killed."
|
echo "Ensuring container killed."
|
||||||
docker rm -vf docker-pr$BUILD_NUMBER || true
|
cids=$(docker ps -aq -f name=docker-pr${BUILD_NUMBER}-*)
|
||||||
|
[ -n "$cids" ] && docker rm -vf $cids || true
|
||||||
'''
|
'''
|
||||||
|
|
||||||
sh '''
|
sh '''
|
||||||
|
@ -701,8 +702,6 @@ pipeline {
|
||||||
sh '''
|
sh '''
|
||||||
echo "Ensuring container killed."
|
echo "Ensuring container killed."
|
||||||
docker rm -vf docker-pr$BUILD_NUMBER || true
|
docker rm -vf docker-pr$BUILD_NUMBER || true
|
||||||
cids=$(docker ps -aq -f name=docker-pr${BUILD_NUMBER}-*)
|
|
||||||
[ -n "$cids" ] && docker rm -vf $cids || true
|
|
||||||
'''
|
'''
|
||||||
|
|
||||||
sh '''
|
sh '''
|
||||||
|
|
Loading…
Add table
Reference in a new issue