Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add support for Bottlenecks' new framework and potential installers
[releng.git]
/
jjb
/
functest
/
functest-suite.sh
diff --git
a/jjb/functest/functest-suite.sh
b/jjb/functest/functest-suite.sh
index
5d1ed28
..
9b7f135
100755
(executable)
--- 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
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
docker exec $container_id $cmd
let global_ret_val+=$?
done