Merge "Weekly Anteater Project Additions"

[releng.git] / jjb / functest / functest-loop.sh

diff --git a/jjb/functest/functest-loop.sh b/jjb/functest/functest-loop.sh
index 7385623..a590d9f 100755 (executable)
--- a/jjb/functest/functest-loop.sh
+++ b/jjb/functest/functest-loop.sh
@@ -1,18 +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"
+ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value"
 echo ${ret_value}>${ret_val_file}
 
-exit 0
\ No newline at end of file
+exit 0