diff options
Diffstat (limited to 'jjb/functest')
| -rw-r--r-- | jjb/functest/functest-project-jobs.yml | 2 | ||||
| -rwxr-xr-x | jjb/functest/set-functest-env.sh | 11 |
2 files changed, 9 insertions, 4 deletions
diff --git a/jjb/functest/functest-project-jobs.yml b/jjb/functest/functest-project-jobs.yml index 14ad73a91..7036f20c0 100644 --- a/jjb/functest/functest-project-jobs.yml +++ b/jjb/functest/functest-project-jobs.yml @@ -88,4 +88,4 @@ name: functest-unit-tests-and-docs-build builders: - shell: | - $WORKSPACE/run_unit_tests.sh + cd $WORKSPACE && tox diff --git a/jjb/functest/set-functest-env.sh b/jjb/functest/set-functest-env.sh index 1acf0a2ad..89dabb056 100755 --- a/jjb/functest/set-functest-env.sh +++ b/jjb/functest/set-functest-env.sh @@ -48,7 +48,6 @@ if [[ ${INSTALLER_TYPE} == 'apex' ]]; then fi - # Set iptables rule to allow forwarding return traffic for container if ! sudo iptables -C FORWARD -j RETURN 2> ${redirect} || ! sudo iptables -L FORWARD | awk 'NR==3' | grep RETURN 2> ${redirect}; then sudo iptables -I FORWARD -j RETURN @@ -59,6 +58,12 @@ 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} +images_vol="-v ${images_dir}:/home/opnfv/functest/images" + dir_result="${HOME}/opnfv/functest/results/${BRANCH##*/}" mkdir -p ${dir_result} sudo rm -rf ${dir_result}/* @@ -80,7 +85,7 @@ if [[ ${INSTALLER_TYPE} == 'compass' && ${DEPLOY_SCENARIO} == *'os-nosdn-openo-h envs=${env}" -e OPENO_MSB_ENDPOINT=${openo_msb_endpoint}" fi -volumes="${results_vol} ${sshkey_vol} ${stackrc_vol} ${rc_file_vol}" +volumes="${images_vol} ${results_vol} ${sshkey_vol} ${stackrc_vol} ${rc_file_vol}" HOST_ARCH=$(uname -m) FUNCTEST_IMAGE="opnfv/functest" @@ -88,7 +93,7 @@ if [ "$HOST_ARCH" = "aarch64" ]; then FUNCTEST_IMAGE="${FUNCTEST_IMAGE}_${HOST_ARCH}" fi -echo "Functest: Pulling image ${FUNCTEST_IMAGE}:${DOCKER_TAG}" +echo "Functest: Pulling Functest Docker image ${FUNCTEST_IMAGE}:${DOCKER_TAG}" docker pull ${FUNCTEST_IMAGE}:$DOCKER_TAG >/dev/null cmd="sudo docker run --privileged=true -id ${envs} ${volumes} \ |