summaryrefslogtreecommitdiffstats
path: root/jjb/functest/functest-suite.sh
diff options
context:
space:
mode:
authorjose.lausuch <jose.lausuch@ericsson.com>2017-07-04 14:35:23 +0200
committerjose.lausuch <jose.lausuch@ericsson.com>2017-07-04 14:35:23 +0200
commit7751297321734380928506bd7382cc1c9578057e (patch)
tree0a116b48e02f0a31dfd9a39cefce6a19280a7e32 /jjb/functest/functest-suite.sh
parent52652dfc80da5267910a952272f863070a0e7a06 (diff)
Use former calls to running Functest in Danube
Change-Id: I472a41e3c2ad41e97a6f4ea3b82d72df73c8416b Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
Diffstat (limited to 'jjb/functest/functest-suite.sh')
-rwxr-xr-xjjb/functest/functest-suite.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/jjb/functest/functest-suite.sh b/jjb/functest/functest-suite.sh
index 469a57726..9b7f1356c 100755
--- a/jjb/functest/functest-suite.sh
+++ b/jjb/functest/functest-suite.sh
@@ -10,7 +10,11 @@ global_ret_val=0
tests=($(echo $FUNCTEST_SUITE_NAME | tr "," "\n"))
for test in ${tests[@]}; do
- cmd="run_tests -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