diff options
| author |   Cristina Pauna <cristina.pauna@enea.com> | 2017-02-10 16:38:00 +0200 |
|---|---|---|
| committer | Cristina Pauna <cristina.pauna@enea.com> | 2017-02-10 16:48:37 +0200 |
| commit | 1e2f80cdd0938a78dbbc3253f11f6ea8662d7d87 (patch) | |
| tree | 4165fd378aae4ed9e80b0b06858f2b04ea26cc7f /jjb/functest/functest-cleanup.sh | |
| parent | 3db5a7e6775e3ad247d9de03a0a6254f6eeb0bf6 (diff) | |
Use the aarch64 image for functest
An aarch64 image was created for functest in
https://gerrit.opnfv.org/gerrit/#/c/27801/
This image is build and pushed with
https://gerrit.opnfv.org/gerrit/#/c/28291/
In this commit, the aarch64 image is pulled when an aarch64
jenkins slave is used for running functest.
JIRA: ARMBAND-180
Change-Id: Idfe7115275a056ef5137cff0a963910c2707457c
Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>
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..." |