summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-03-21 00:16:26 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-03-21 00:16:26 +0000
commitf52791a91fe3284747b8c9022ee584911ece8dd3 (patch)
treeddb44445f5171d9971b2e30eca0bdc8f9ea24062 /scripts
parent40a329556f63d919a68dd80bb37b087d1f0e6336 (diff)
downloadgitlab-ce-f52791a91fe3284747b8c9022ee584911ece8dd3.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts')
-rw-r--r--scripts/rspec_helpers.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/rspec_helpers.sh b/scripts/rspec_helpers.sh
index bd2c01dac5e..f96f96c4725 100644
--- a/scripts/rspec_helpers.sh
+++ b/scripts/rspec_helpers.sh
@@ -124,8 +124,8 @@ function debug_rspec_variables() {
echoinfo "SKIP_FLAKY_TESTS_AUTOMATICALLY: ${SKIP_FLAKY_TESTS_AUTOMATICALLY}"
echoinfo "RETRY_FAILED_TESTS_IN_NEW_PROCESS: ${RETRY_FAILED_TESTS_IN_NEW_PROCESS}"
- echoinfo "KNAPSACK_GENERATE_REPORT: ${KNAPSACK_GENERATE_REPORT}"
- echoinfo "FLAKY_RSPEC_GENERATE_REPORT: ${FLAKY_RSPEC_GENERATE_REPORT}"
+ echoinfo "KNAPSACK_GENERATE_REPORT: ${KNAPSACK_GENERATE_REPORT:-}"
+ echoinfo "FLAKY_RSPEC_GENERATE_REPORT: ${FLAKY_RSPEC_GENERATE_REPORT:-}"
echoinfo "KNAPSACK_TEST_FILE_PATTERN: ${KNAPSACK_TEST_FILE_PATTERN}"
echoinfo "KNAPSACK_LOG_LEVEL: ${KNAPSACK_LOG_LEVEL}"
@@ -136,7 +136,7 @@ function debug_rspec_variables() {
echoinfo "NEW_FLAKY_RSPEC_REPORT_PATH: ${NEW_FLAKY_RSPEC_REPORT_PATH}"
echoinfo "SKIPPED_FLAKY_TESTS_REPORT_PATH: ${SKIPPED_FLAKY_TESTS_REPORT_PATH}"
- echoinfo "CRYSTALBALL: ${CRYSTALBALL}"
+ echoinfo "CRYSTALBALL: ${CRYSTALBALL:-}"
}
function handle_retry_rspec_in_new_process() {