Jenkinsfile: move integration step cleanup to amd64 where it was intended to be
@@ -332,7 +332,8 @@ pipeline {
always {
sh '''
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 '''
@@ -701,8 +702,6 @@ pipeline {
sh '''
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 '''
