Commit fc51ae37 authored by anonym's avatar anonym
Browse files

Defer the cucumber args logic to run_test_suite instead of `rake test`.

We dropped the idea of implementing the cucumber args logic in the
Rake's 'test' task, and instead implement it in `run_test_suite`.

Closes: tails/sysadmin#17772
parent d12621ae
......@@ -78,10 +78,10 @@ based_on_buster() {
"$(git rev-parse --verify HEAD)"
}
rake_test_is_supported() {
RAKE_TEST_SUPPORTED_COMMIT=d70e3bfb2e4c580ca233a457e429e821c1a25e2e
tails_git_cucumber_logic_supported() {
CUCUMBER_LOGIC_SUPPORTED_COMMIT=fb1baf2ca32dfde32e840b7595259092a502660c
git merge-base --is-ancestor \
"$RAKE_TEST_SUPPORTED_COMMIT" \
"$CUCUMBER_LOGIC_SUPPORTED_COMMIT" \
"$(git rev-parse --verify HEAD)"
}
......@@ -125,11 +125,9 @@ perl -pi -E \
s{\A(\s*password:\s*).*}{\$1test}" \
"${WORKSPACE}/features/config/common.d/thunderbird.yml"
if rake_test_is_supported; then
TEST_SUITE_COMMAND="rake test"
if tails_git_cucumber_logic_supported; then
TAGS_ARGS=""
else
TEST_SUITE_COMMAND="./run_test_suite"
if echo "${UPSTREAMJOB_GIT_BRANCH}" | grep -q -E '[+-]force-all-tests$' \
|| [ "${GIT_BRANCH#origin/}" = testing ] \
|| [ "${GIT_BRANCH#origin/}" = feature/tor-nightly-master ] \
......@@ -145,7 +143,7 @@ else
fi
fi
as_root_do ${TEST_SUITE_COMMAND} \
as_root_do ./run_test_suite \
--old-iso "${PREVIOUS_ISO}" \
--iso "${UPSTREAMJOB_ISO}" \
--artifacts-base-uri "${JENKINS_URL}job/${JOB_NAME}/${BUILD_NUMBER}/artifact/build-artifacts/" \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment