diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-29 21:12:32 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-29 21:12:32 +0000 |
| commit | 42a29f3879305e8bec27b29586e1c9f1ce02bbcf (patch) | |
| tree | 5423a331a7d28137e50a4224e2320b469ee58eec /scripts/rspec_helpers.sh | |
| parent | fef5449973e2097fbedd92980d78dc4baf54afd6 (diff) | |
| download | gitlab-ce-42a29f3879305e8bec27b29586e1c9f1ce02bbcf.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts/rspec_helpers.sh')
| -rw-r--r-- | scripts/rspec_helpers.sh | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/scripts/rspec_helpers.sh b/scripts/rspec_helpers.sh index 797d9188f81..280a1586de3 100644 --- a/scripts/rspec_helpers.sh +++ b/scripts/rspec_helpers.sh @@ -109,14 +109,18 @@ function rspec_paralellized_job() { local test_level="${job_name[1]}" local report_name=$(echo "${CI_JOB_NAME}" | sed -E 's|[/ ]|_|g') # e.g. 'rspec unit pg12 1/24' would become 'rspec_unit_pg12_1_24' local rspec_opts="${1}" - local spec_folder_prefix="" + local spec_folder_prefixes="" if [[ "${test_tool}" =~ "-ee" ]]; then - spec_folder_prefix="ee/" + spec_folder_prefixes="'ee/'" fi if [[ "${test_tool}" =~ "-jh" ]]; then - spec_folder_prefix="jh/" + spec_folder_prefixes="'jh/'" + fi + + if [[ "${test_tool}" =~ "-all" ]]; then + spec_folder_prefixes="['', 'ee/']" fi export KNAPSACK_LOG_LEVEL="debug" @@ -131,7 +135,7 @@ function rspec_paralellized_job() { cp "${KNAPSACK_RSPEC_SUITE_REPORT_PATH}" "${KNAPSACK_REPORT_PATH}" if [[ -z "${KNAPSACK_TEST_FILE_PATTERN}" ]]; then - pattern=$(ruby -r./tooling/quality/test_level.rb -e "puts Quality::TestLevel.new(%(${spec_folder_prefix})).pattern(:${test_level})") + pattern=$(ruby -r./tooling/quality/test_level.rb -e "puts Quality::TestLevel.new(${spec_folder_prefixes}).pattern(:${test_level})") export KNAPSACK_TEST_FILE_PATTERN="${pattern}" fi |