X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-loop.sh;h=00a5f135b3bd19bbb20b0ba6263d6ed14c93561e;hb=709f56704f29a943abc7b4a339b4d184270a2420;hp=869c3956cd7b1cf2badde0aa683b6542ad55e709;hpb=33ff97219e4915e4412eb4822918766ea2e2d1dc;p=releng.git diff --git a/jjb/functest/functest-loop.sh b/jjb/functest/functest-loop.sh index 869c3956c..00a5f135b 100755 --- a/jjb/functest/functest-loop.sh +++ b/jjb/functest/functest-loop.sh @@ -1,8 +1,12 @@ #!/bin/bash set +e - -cmd="python ${FUNCTEST_REPO_DIR}/functest/ci/run_tests.py -t all ${flags}" +[[ "$PUSH_RESULTS_TO_DB" == "true" ]] && flags+="-r" +if [ "$BRANCH" == 'master' ]; then + cmd="run_tests -t all ${flags}" +else + cmd="python ${FUNCTEST_REPO_DIR}/functest/ci/run_tests.py -t all ${flags}" +fi container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1) docker exec $container_id $cmd