summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJose Lausuch <jose.lausuch@ericsson.com>2017-07-17 07:38:55 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-07-17 07:38:55 +0000
commitc6cb6fae1560345d44a457e990f009b350835a1e (patch)
tree35f5b13aae57b876eb2774bdf27ceec34faa2834
parent3983bb3199ed4d8b9cb3cfc51ac3dd064199b2f3 (diff)
parent3fca8e9b0ee76f060a0b0e0f5ed750906ac43ea2 (diff)
Merge "[Functest] Adapt set-functest-env to download OS images"
-rwxr-xr-xjjb/functest/set-functest-env.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/jjb/functest/set-functest-env.sh b/jjb/functest/set-functest-env.sh
index 72a9e1eda..f6071e37a 100755
--- a/jjb/functest/set-functest-env.sh
+++ b/jjb/functest/set-functest-env.sh
@@ -25,6 +25,7 @@ fi
DEPLOY_TYPE=baremetal
[[ $BUILD_TAG =~ "virtual" ]] && DEPLOY_TYPE=virt
+HOST_ARCH=$(uname -m)
echo "Functest: Start Docker and prepare environment"
@@ -32,7 +33,7 @@ if [ "$BRANCH" != 'stable/danube' ]; then
echo "Functest: Download images that will be used by test cases"
images_dir="${HOME}/opnfv/functest/images"
chmod +x ${WORKSPACE}/functest/ci/download_images.sh
- ${WORKSPACE}/functest/ci/download_images.sh ${images_dir} 2> ${redirect}
+ ${WORKSPACE}/functest/ci/download_images.sh ${images_dir} ${DEPLOY_SCENARIO} ${HOST_ARCH} 2> ${redirect}
images_vol="-v ${images_dir}:/home/opnfv/functest/images"
fi
@@ -63,7 +64,6 @@ else
volumes="${results_vol} ${sshkey_vol} ${stackrc_vol} ${rc_file_vol}"
fi
-HOST_ARCH=$(uname -m)
FUNCTEST_IMAGE="opnfv/functest"
if [ "$HOST_ARCH" = "aarch64" ]; then
FUNCTEST_IMAGE="${FUNCTEST_IMAGE}_${HOST_ARCH}"