summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2020-02-16 17:39:03 +0000
committerintrigeri <intrigeri@boum.org>2020-02-16 17:39:03 +0000
commit189b63bc87e0901dc423061340ae1f09c4db068d (patch)
treeca60cecba658347274cd2b9a2866d8f6b98e80bd
parent46ad3c627b16c54342bf6a380116a4c223e1450e (diff)
wrap_test_suite: also support the -force-all-tests branch suffix
Previously we only honored the +force-all-tests suffix. But the corresponding Jenkins job will instead have the -force-all-tests suffix, so I've seen developers get confused (very understandably!) and think that we'll run the full test suite on a branch with the -force-all-tests suffix. So let's make the system behave like its users expect it to :)
-rwxr-xr-x[-rw-r--r--]files/jenkins/slaves/isotesters/wrap_test_suite2
1 files changed, 1 insertions, 1 deletions
diff --git a/files/jenkins/slaves/isotesters/wrap_test_suite b/files/jenkins/slaves/isotesters/wrap_test_suite
index 11bfdf4..cb7e863 100644..100755
--- a/files/jenkins/slaves/isotesters/wrap_test_suite
+++ b/files/jenkins/slaves/isotesters/wrap_test_suite
@@ -113,7 +113,7 @@ perl -pi -E \
s{\A(\s*password:\s*).*}{\$1test}" \
"${WORKSPACE}/features/config/common.d/thunderbird.yml"
-if echo "${UPSTREAMJOB_GIT_BRANCH}" | grep -q -E '\+force-all-tests$' \
+if echo "${UPSTREAMJOB_GIT_BRANCH}" | grep -q -E '[+-]force-all-tests$' \
|| [ "${GIT_BRANCH#origin/}" = testing ] \
|| [ "${GIT_BRANCH#origin/}" = feature/tor-nightly-master ] \
|| [ "${GIT_BRANCH#origin/}" = devel ] ; then