X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-suite.sh;h=9b7f1356c1756b339898cea337ecb55cb2a1ba79;hb=0c7bc1c58ce45b5c19a1c4f1a757363efe819a49;hp=228cc3da4b4513240ac13d7623e70ac7fa300c15;hpb=35bf4722a3e84c883fa5212be1bfe3424ad9c3b0;p=releng.git

diff --git a/jjb/functest/functest-suite.sh b/jjb/functest/functest-suite.sh
index 228cc3da4..9b7f1356c 100755
--- a/jjb/functest/functest-suite.sh
+++ b/jjb/functest/functest-suite.sh
@@ -10,9 +10,16 @@ global_ret_val=0
 
 tests=($(echo $FUNCTEST_SUITE_NAME | tr "," "\n"))
 for test in ${tests[@]}; do
-    cmd="python /home/opnfv/repos/functest/functest/ci/run_tests.py -t $test"
+    if [ "$BRANCH" == 'master' ]; then
+        cmd="run_tests -t $test"
+    else
+        cmd="python /home/opnfv/repos/functest/functest/ci/run_tests.py -t $test"
+    fi
     docker exec $container_id $cmd
     let global_ret_val+=$?
 done
 
-exit $global_ret_val
+ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value"
+echo ${global_ret_val}>${ret_val_file}
+
+exit 0