From 4e8c8922da341914b9fd5570ec9ce7a29ffdfebd Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 30 Sep 2021 12:12:36 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- scripts/rspec_helpers.sh | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'scripts/rspec_helpers.sh') diff --git a/scripts/rspec_helpers.sh b/scripts/rspec_helpers.sh index 280a1586de3..797d9188f81 100644 --- a/scripts/rspec_helpers.sh +++ b/scripts/rspec_helpers.sh @@ -109,18 +109,14 @@ 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_prefixes="" + local spec_folder_prefix="" if [[ "${test_tool}" =~ "-ee" ]]; then - spec_folder_prefixes="'ee/'" + spec_folder_prefix="ee/" fi if [[ "${test_tool}" =~ "-jh" ]]; then - spec_folder_prefixes="'jh/'" - fi - - if [[ "${test_tool}" =~ "-all" ]]; then - spec_folder_prefixes="['', 'ee/']" + spec_folder_prefix="jh/" fi export KNAPSACK_LOG_LEVEL="debug" @@ -135,7 +131,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_prefixes}).pattern(:${test_level})") + pattern=$(ruby -r./tooling/quality/test_level.rb -e "puts Quality::TestLevel.new(%(${spec_folder_prefix})).pattern(:${test_level})") export KNAPSACK_TEST_FILE_PATTERN="${pattern}" fi -- cgit v1.2.1