Merge "Add the pod info to the job name"
authorSerena Feng <feng.xiaowei@zte.com.cn>
Wed, 22 Nov 2017 02:10:41 +0000 (02:10 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Wed, 22 Nov 2017 02:10:41 +0000 (02:10 +0000)
jjb/functest/functest-cleanup.sh

index fc277b9..c21b543 100755 (executable)
@@ -3,11 +3,7 @@
 [[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null"
 
 echo "Cleaning up docker containers/images..."
-HOST_ARCH=$(uname -m)
 FUNCTEST_IMAGE=opnfv/functest
-if [ "$HOST_ARCH" = "aarch64" ]; then
-    FUNCTEST_IMAGE="${FUNCTEST_IMAGE}_${HOST_ARCH}"
-fi
 
 # Remove containers along with image opnfv/functest*:<none>
 dangling_images=($(docker images -f "dangling=true" | grep $FUNCTEST_IMAGE | awk '{print $3}'))