From: Serena Feng <feng.xiaowei@zte.com.cn>
Date: Wed, 22 Nov 2017 02:10:41 +0000 (+0000)
Subject: Merge "Add the pod info to the job name"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=99ef5a834d97d82f3bd0b43170bfb2d7aa2e4113;hp=c20986a270bed4de42a00c8511c175ece5c4930f;p=releng.git

Merge "Add the pod info to the job name"
---

diff --git a/jjb/functest/functest-cleanup.sh b/jjb/functest/functest-cleanup.sh
index fc277b9ed..c21b543a6 100755
--- a/jjb/functest/functest-cleanup.sh
+++ b/jjb/functest/functest-cleanup.sh
@@ -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}'))