X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-loop.sh;h=a590d9f952ac4d26de1c3af4cb32f5c48c4358c1;hb=2dab5a73f0ab1376d924559e2809be0bffe33103;hp=5abddfd84d26c9afd1af9f3dbe2165349c6ae442;hpb=7a15fe87e945549232a804e2984561dd772258ef;p=releng.git diff --git a/jjb/functest/functest-loop.sh b/jjb/functest/functest-loop.sh index 5abddfd84..a590d9f95 100755 --- a/jjb/functest/functest-loop.sh +++ b/jjb/functest/functest-loop.sh @@ -1,12 +1,14 @@ #!/bin/bash set +e -branch=${GIT_BRANCH##*/} [[ "$PUSH_RESULTS_TO_DB" == "true" ]] && flags+="-r" -if [[ ${branch} == *"brahmaputra"* ]]; then - cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh -s ${flags}" -else - cmd="python ${FUNCTEST_REPO_DIR}/ci/run_tests.py -t all ${flags}" -fi +cmd="run_tests -t all ${flags}" + container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1) docker exec $container_id $cmd + +ret_value=$? +ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value" +echo ${ret_value}>${ret_val_file} + +exit 0