Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
merge GIT_BRANCH and GERRIT_BRANCH into BRANCH
[releng.git]
/
jjb
/
functest
/
functest-suite.sh
diff --git
a/jjb/functest/functest-suite.sh
b/jjb/functest/functest-suite.sh
index
9dc8dec
..
28d7e3d
100755
(executable)
--- a/
jjb/functest/functest-suite.sh
+++ b/
jjb/functest/functest-suite.sh
@@
-1,11
+1,10
@@
#!/bin/bash
set -e
#!/bin/bash
set -e
-branch=${GIT_BRANCH##*/}
-echo "Functest: run $FUNCTEST_SUITE_NAME on branch ${branch}"
-if [[ ${branch} == *"brahmaputra"* ]]; then
+echo "Functest: run $FUNCTEST_SUITE_NAME on branch $BRANCH"
+if [[ "$BRANCH" =~ 'brahmaputra' ]]; then
cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh --test $FUNCTEST_SUITE_NAME"
cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh --test $FUNCTEST_SUITE_NAME"
-elif [[
${branch} == *"colorado"*
]]; then
+elif [[
"$BRANCH" =~ 'colorado'
]]; then
cmd="python ${FUNCTEST_REPO_DIR}/ci/run_tests.py -t $FUNCTEST_SUITE_NAME"
else
cmd="functest testcase run $FUNCTEST_SUITE_NAME"
cmd="python ${FUNCTEST_REPO_DIR}/ci/run_tests.py -t $FUNCTEST_SUITE_NAME"
else
cmd="functest testcase run $FUNCTEST_SUITE_NAME"