Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
360d90c1
Commit
360d90c1
authored
Sep 07, 2021
by
Albert Salim
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Merge branch 'alberts-cleanup-env-var' into 'master'"
This reverts merge request !69349
parent
c686a69f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
3 deletions
+7
-3
.gitlab/ci/rails.gitlab-ci.yml
.gitlab/ci/rails.gitlab-ci.yml
+1
-1
.gitlab/ci/setup.gitlab-ci.yml
.gitlab/ci/setup.gitlab-ci.yml
+1
-0
scripts/rspec_helpers.sh
scripts/rspec_helpers.sh
+1
-1
tooling/bin/find_tests
tooling/bin/find_tests
+4
-1
No files found.
.gitlab/ci/rails.gitlab-ci.yml
View file @
360d90c1
...
...
@@ -21,7 +21,7 @@
.minimal-rspec-tests
:
variables
:
MINIMAL_RSPEC
_ENABLED
:
"
true"
RSPEC_TESTS_MAPPING
_ENABLED
:
"
true"
.decomposed-database-rspec
:
variables
:
...
...
.gitlab/ci/setup.gitlab-ci.yml
View file @
360d90c1
...
...
@@ -82,6 +82,7 @@ detect-tests:
-
.detect-test-base
-
.rails:rules:detect-tests
variables
:
RSPEC_TESTS_MAPPING_ENABLED
:
"
true"
MATCHED_TESTS_FILE
:
tmp/matching_tests.txt
detect-tests as-if-foss
:
...
...
scripts/rspec_helpers.sh
View file @
360d90c1
...
...
@@ -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
}
"
...
...
tooling/bin/find_tests
View file @
360d90c1
...
...
@@ -22,7 +22,10 @@ changed_files = mr_changes.changes.map { |change| change['new_path'] }
tff
=
TestFileFinder
::
FileFinder
.
new
(
paths:
changed_files
).
tap
do
|
file_finder
|
file_finder
.
use
TestFileFinder
::
MappingStrategies
::
PatternMatching
.
load
(
'tests.yml'
)
file_finder
.
use
TestFileFinder
::
MappingStrategies
::
DirectMatching
.
load_json
(
ENV
[
'RSPEC_TESTS_MAPPING_PATH'
])
if
ENV
[
'RSPEC_TESTS_MAPPING_ENABLED'
]
file_finder
.
use
TestFileFinder
::
MappingStrategies
::
DirectMatching
.
load_json
(
ENV
[
'RSPEC_TESTS_MAPPING_PATH'
])
end
end
File
.
write
(
output_file
,
tff
.
test_files
.
uniq
.
join
(
' '
))
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment