diff options
Diffstat (limited to 'jjb/functest')
| -rw-r--r-- | jjb/functest/functest-alpine.sh | 4 | ||||
| -rw-r--r-- | jjb/functest/functest-project-jobs.yml | 3 | ||||
| -rwxr-xr-x | jjb/functest/set-functest-env.sh | 6 |
3 files changed, 9 insertions, 4 deletions
diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index 9084ccaa7..da098862a 100644 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -67,9 +67,9 @@ fi volumes="${images_vol} ${results_vol} ${sshkey_vol} ${rc_file_vol} ${cacert_file_vol}" -tiers=(healthcheck smoke) +tiers=(healthcheck smoke features vnf) for tier in ${tiers[@]}; do - FUNCTEST_IMAGE=opnfv/functest-${tier} + FUNCTEST_IMAGE=ollivier/functest-${tier} echo "Functest: Pulling Functest Docker image ${FUNCTEST_IMAGE} ..." docker pull ${FUNCTEST_IMAGE}>/dev/null cmd="docker run ${envs} ${volumes} ${FUNCTEST_IMAGE}" diff --git a/jjb/functest/functest-project-jobs.yml b/jjb/functest/functest-project-jobs.yml index 353423d59..07d5df46e 100644 --- a/jjb/functest/functest-project-jobs.yml +++ b/jjb/functest/functest-project-jobs.yml @@ -80,6 +80,7 @@ healthy: 50 unhealthy: 40 failing: 30 + - email-jenkins-admins-on-failure - job-template: name: 'functest-docs-upload-{stream}' @@ -131,4 +132,4 @@ builders: - shell: | cd $WORKSPACE && tox -edocs - wget -O - https://git.opnfv.org/releng/plain/utils/upload-artifact.sh | bash -s "functest/api/_build" "docs" + wget -O - https://git.opnfv.org/releng/plain/utils/upload-artifact.sh | bash -s "api/_build" "docs" diff --git a/jjb/functest/set-functest-env.sh b/jjb/functest/set-functest-env.sh index 10f949a3e..7d9e737e7 100755 --- a/jjb/functest/set-functest-env.sh +++ b/jjb/functest/set-functest-env.sh @@ -33,8 +33,9 @@ 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} ${DEPLOY_SCENARIO} ${HOST_ARCH} 2> ${redirect} + ${WORKSPACE}/functest/ci/download_images.sh ${images_dir} images_vol="-v ${images_dir}:/home/opnfv/functest/images" + echo "Functest: Images successfully downloaded" fi dir_result="${HOME}/opnfv/functest/results/${BRANCH##*/}" @@ -43,6 +44,7 @@ sudo rm -rf ${dir_result}/* results_vol="-v ${dir_result}:/home/opnfv/functest/results" custom_params= test -f ${HOME}/opnfv/functest/custom/params_${DOCKER_TAG} && custom_params=$(cat ${HOME}/opnfv/functest/custom/params_${DOCKER_TAG}) +echo "Functest: custom parameters successfully retrieved: ${custom_params}" envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \ -e NODE_NAME=${NODE_NAME} -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO} \ @@ -70,6 +72,8 @@ else volumes="${results_vol} ${sshkey_vol} ${stackrc_vol} ${rc_file_vol}" fi +echo "Functest: volumes defined" + FUNCTEST_IMAGE="opnfv/functest" if [ "$HOST_ARCH" = "aarch64" ]; then FUNCTEST_IMAGE="${FUNCTEST_IMAGE}_${HOST_ARCH}" |