diff options
author | Jose Lausuch <jose.lausuch@ericsson.com> | 2017-07-20 06:48:24 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-07-20 06:48:24 +0000 |
commit | 12e8b5c1a72d7a29af8a356fed87373701221b2c (patch) | |
tree | c73cffc1e817552540a31bea519a3fc0abcfece0 | |
parent | 20826c00015567244153ab2e7b39452600fd38c7 (diff) | |
parent | 6174d29163618ce4818696adc1d680c22a4a5e9f (diff) |
Merge "[Functest] Wget download_images.sh to support Alpine on Danube jobs"
-rw-r--r-- | jjb/functest/functest-alpine.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index 4b4c36503..512a01edc 100644 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -33,8 +33,14 @@ echo "Functest: Start Docker and prepare environment" 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} ${DEPLOY_SCENARIO} ${HOST_ARCH} 2> ${redirect} +download_script=${WORKSPACE}/functest/ci/download_images.sh +if [[ ! -f ${download_script} ]]; then + # to support Danube as well + wget https://git.opnfv.org/functest/plain/functest/ci/download_images.sh -O ${download_script} 2> ${redirect} +fi +chmod +x ${download_script} +${download_script} ${images_dir} ${DEPLOY_SCENARIO} ${HOST_ARCH} 2> ${redirect} + images_vol="-v ${images_dir}:${FUNCTEST_DIR}/images" dir_result="${HOME}/opnfv/functest/results/${BRANCH##*/}" |