diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-07 12:11:43 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-07 12:11:43 +0300 |
commit | 378308b6cde44eb1a320b9202ff8946a911f35f6 (patch) | |
tree | 3031a645455dbbcdb2961dd09c15100fa28ed8e1 /scripts | |
parent | 777dc3053f8433a9f5c9cc868325e16eac5d93e5 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/rspec_helpers.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/rspec_helpers.sh b/scripts/rspec_helpers.sh index 4fc62038d4f..797d9188f81 100644 --- a/scripts/rspec_helpers.sh +++ b/scripts/rspec_helpers.sh @@ -159,7 +159,7 @@ function rspec_paralellized_job() { local rspec_args="-Ispec -rspec_helper --color --format documentation --format RspecJunitFormatter --out junit_rspec.xml ${rspec_opts}" - if [[ -n $MINIMAL_RSPEC_ENABLED ]]; then + if [[ -n $RSPEC_TESTS_MAPPING_ENABLED ]]; then tooling/bin/parallel_rspec --rspec_args "${rspec_args}" --filter "tmp/matching_tests.txt" else tooling/bin/parallel_rspec --rspec_args "${rspec_args}" |