summaryrefslogtreecommitdiffstats
path: root/jjb/functest
diff options
context:
space:
mode:
authorJose Lausuch <jalausuch@suse.com>2017-09-29 16:02:12 +0200
committerJose Lausuch <jalausuch@suse.com>2017-09-29 16:03:33 +0200
commitdfe753614f32cc74bcd7d73e088a4dad298e85eb (patch)
tree40f83e30c1be4cc0158c24d823328a5ec39687dc /jjb/functest
parent672dcd6af0de50c026abab58f0483092461b1719 (diff)
[Functest] Remove former way to execute run_tests
It was used in Danube and there are no more Functest jobs that are runnign stable/danube branch. Change-Id: If297487767e8e8ead39aa4a10f58c6554be197b0 Signed-off-by: Jose Lausuch <jalausuch@suse.com>
Diffstat (limited to 'jjb/functest')
-rwxr-xr-xjjb/functest/functest-loop.sh6
-rwxr-xr-xjjb/functest/functest-suite.sh6
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