Commit a90781f9 authored by Lin Jen-Shin's avatar Lin Jen-Shin

Set $rspec_run_status properly

parent 6dfa934b
...@@ -279,7 +279,8 @@ function rspec_paralellized_job() { ...@@ -279,7 +279,8 @@ function rspec_paralellized_job() {
# Experiment to retry failed examples in a new RSpec process: https://gitlab.com/gitlab-org/quality/team-tasks/-/issues/1148 # Experiment to retry failed examples in a new RSpec process: https://gitlab.com/gitlab-org/quality/team-tasks/-/issues/1148
if [[ $rspec_run_status -ne 0 ]]; then if [[ $rspec_run_status -ne 0 ]]; then
if [[ "${RETRY_FAILED_TESTS_IN_NEW_PROCESS}" == "true" ]]; then if [[ "${RETRY_FAILED_TESTS_IN_NEW_PROCESS}" == "true" ]]; then
$rspec_run_status=$(retry_failed_rspec_examples) retry_failed_rspec_examples
rspec_run_status=$?
fi fi
else else
echosuccess "No examples to retry, congrats!" echosuccess "No examples to retry, congrats!"
...@@ -310,7 +311,7 @@ function retry_failed_rspec_examples() { ...@@ -310,7 +311,7 @@ function retry_failed_rspec_examples() {
# Merge the JUnit report from retry into the first-try report # Merge the JUnit report from retry into the first-try report
junit_merge "${JUNIT_RETRY_FILE}" "${JUNIT_RESULT_FILE}" junit_merge "${JUNIT_RETRY_FILE}" "${JUNIT_RESULT_FILE}"
return $rspec_run_status exit $rspec_run_status
} }
function rspec_rerun_previous_failed_tests() { function rspec_rerun_previous_failed_tests() {
......
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