diff options
| -rwxr-xr-x | jjb/functest/functest-loop.sh | 6 | ||||
| -rwxr-xr-x | jjb/functest/functest-suite.sh | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/jjb/functest/functest-loop.sh b/jjb/functest/functest-loop.sh index 00a5f135b..a590d9f95 100755 --- a/jjb/functest/functest-loop.sh +++ b/jjb/functest/functest-loop.sh @@ -2,11 +2,7 @@ set +e [[ "$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 +cmd="run_tests -t all ${flags}" container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1) docker exec $container_id $cmd diff --git a/jjb/functest/functest-suite.sh b/jjb/functest/functest-suite.sh index 9b7f1356c..469a57726 100755 --- a/jjb/functest/functest-suite.sh +++ b/jjb/functest/functest-suite.sh @@ -10,11 +10,7 @@ global_ret_val=0 tests=($(echo $FUNCTEST_SUITE_NAME | tr "," "\n")) for test in ${tests[@]}; do - if [ "$BRANCH" == 'master' ]; then - cmd="run_tests -t $test" - else - cmd="python /home/opnfv/repos/functest/functest/ci/run_tests.py -t $test" - fi + cmd="run_tests -t $test" docker exec $container_id $cmd let global_ret_val+=$? done |