diff options
| author |   Trevor Bramwell <tbramwell@linuxfoundation.org> | 2018-09-25 05:47:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-09-25 05:47:36 +0000 |
| commit | ac647b0414bd14615ebd4927a2926b328eaceda1 (patch) | |
| tree | a9a79f656570347406590103696d1e5c584ffaf8 /jjb | |
| parent | 49f6d3509d810fed4cbc15e1b0b86cf1eb8b266e (diff) | |
| parent | 366a3ab085336f18c24e66a11ce29b7b62bf2b07 (diff) | |
Merge "Fix Functest return values"
Diffstat (limited to 'jjb')
| -rwxr-xr-x | jjb/functest/functest-alpine.sh | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index 4e23d44fe..c82147489 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -26,14 +26,10 @@ check_os_deployment() { } - run_tiers() { tiers=$1 cmd_opt="run_tests -r -t all" [[ $BUILD_TAG =~ "suite" ]] && cmd_opt="run_tests -t all" - ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value" - echo 0 > ${ret_val_file} - for tier in ${tiers[@]}; do FUNCTEST_IMAGE=${REPO}/functest-${tier}:${DOCKER_TAG} echo "Functest: Pulling Functest Docker image ${FUNCTEST_IMAGE} ..." @@ -55,8 +51,6 @@ run_tiers() { run_test() { test_name=$1 cmd_opt="run_tests -t ${test_name}" - ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value" - echo 0 > ${ret_val_file} # Determine which Functest image should be used for the test case case ${test_name} in connection_check|tenantnetwork1|tenantnetwork2|vmready1|vmready2|singlevm1|singlevm2|vping_ssh|vping_userdata|cinder_test|odl|api_check|snaps_health_check) @@ -158,6 +152,9 @@ fi volumes="${images_vol} ${results_vol} ${sshkey_vol} ${userconfig_vol} ${rc_file_vol} ${cacert_file_vol}" +ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value" +echo 0 > ${ret_val_file} + set +e if [ ${FUNCTEST_MODE} == 'testcase' ]; then |