diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-05-23 12:13:36 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2017-05-23 12:14:23 -0400 |
| commit | 5907308211e8d400f00f112ac47ad15057b70988 (patch) | |
| tree | f3c3daaf71be45e3b30a13c74658b1db62a02bd6 /jjb/functest | |
| parent | b78fb39202a79da6b88cede2da4dac696b31011f (diff) | |
Functest: fixes downloading images for danube branch
The script for downloading images "download_images.sh" does not exist in
stable/danube for functest. Therefore we revert to old behavior for
that branch.
Change-Id: Id94f3db27fd5b71bb981007472b55fadae0e5394
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'jjb/functest')
| -rwxr-xr-x | jjb/functest/set-functest-env.sh | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/jjb/functest/set-functest-env.sh b/jjb/functest/set-functest-env.sh index f581f2604..155281ea4 100755 --- a/jjb/functest/set-functest-env.sh +++ b/jjb/functest/set-functest-env.sh @@ -51,11 +51,13 @@ DEPLOY_TYPE=baremetal 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} 2> ${redirect} -images_vol="-v ${images_dir}:/home/opnfv/functest/images" +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} + images_vol="-v ${images_dir}:/home/opnfv/functest/images" +fi dir_result="${HOME}/opnfv/functest/results/${BRANCH##*/}" mkdir -p ${dir_result} @@ -78,7 +80,11 @@ if [[ ${INSTALLER_TYPE} == 'compass' && ${DEPLOY_SCENARIO} == *'os-nosdn-openo-h envs=${env}" -e OPENO_MSB_ENDPOINT=${openo_msb_endpoint}" fi -volumes="${images_vol} ${results_vol} ${sshkey_vol} ${stackrc_vol} ${rc_file_vol}" +if [ "$BRANCH" != 'stable/danube' ]; then + volumes="${images_vol} ${results_vol} ${sshkey_vol} ${stackrc_vol} ${rc_file_vol}" +else + volumes="${results_vol} ${sshkey_vol} ${stackrc_vol} ${rc_file_vol}" +fi HOST_ARCH=$(uname -m) FUNCTEST_IMAGE="opnfv/functest" |