diff options
| author |   Aric Gardner <agardner@linuxfoundation.org> | 2017-02-10 17:22:22 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-02-10 17:22:22 +0000 |
| commit | d9ef12610ff371a6721ed73b6db5a55d118d44f0 (patch) | |
| tree | eeb2dae40680e9d3ae86c70f0fa40feb6093bc91 /jjb/functest/functest-cleanup.sh | |
| parent | ce83f6ed3ebee79464ac226ee69b3ad1664b78d9 (diff) | |
| parent | 1e2f80cdd0938a78dbbc3253f11f6ea8662d7d87 (diff) | |
Merge "Use the aarch64 image for functest"
Diffstat (limited to 'jjb/functest/functest-cleanup.sh')
| -rwxr-xr-x | jjb/functest/functest-cleanup.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/jjb/functest/functest-cleanup.sh b/jjb/functest/functest-cleanup.sh index b03d4778d..3ef9b90dd 100755 --- a/jjb/functest/functest-cleanup.sh +++ b/jjb/functest/functest-cleanup.sh @@ -3,8 +3,13 @@ [[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null" echo "Cleaning up docker containers/images..." +HOST_ARCH=$(uname -m) FUNCTEST_IMAGE=opnfv/functest -# Remove containers along with image opnfv/functest:<none> +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}')) if [[ -n ${dangling_images} ]]; then echo " Removing $FUNCTEST_IMAGE:<none> images and their containers..." |