X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-loop.sh;h=00a5f135b3bd19bbb20b0ba6263d6ed14c93561e;hb=120d08a32166dfd8a8b85a80e8b4e62a35329563;hp=a590d9f952ac4d26de1c3af4cb32f5c48c4358c1;hpb=c5643adaaf9f4dd67b4adc617e00b25f8464d26a;p=releng.git diff --git a/jjb/functest/functest-loop.sh b/jjb/functest/functest-loop.sh index a590d9f95..00a5f135b 100755 --- a/jjb/functest/functest-loop.sh +++ b/jjb/functest/functest-loop.sh @@ -2,7 +2,11 @@ set +e [[ "$PUSH_RESULTS_TO_DB" == "true" ]] && flags+="-r" -cmd="run_tests -t all ${flags}" +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