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
cde6c996
Commit
cde6c996
authored
Jan 20, 2021
by
Albert Salim
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Exclude `ee/` when running in foss
parent
a63eef73
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
1 deletion
+11
-1
.gitlab/ci/rails.gitlab-ci.yml
.gitlab/ci/rails.gitlab-ci.yml
+1
-1
scripts/rspec_helpers.sh
scripts/rspec_helpers.sh
+10
-0
No files found.
.gitlab/ci/rails.gitlab-ci.yml
View file @
cde6c996
...
...
@@ -308,7 +308,7 @@ rspec db-library-code pg12:
-
.rails:rules:ee-and-foss-db-library-code
script
:
-
*base-script
-
rspec_
simple_job "-- spec/lib/gitlab/database/ spec/support/helpers/database/ ee/spec/lib/gitlab/database/ ee/spec/lib/ee/gitlab/database_spec.rb"
-
rspec_
db_library_code
rspec fast_spec_helper
:
extends
:
...
...
scripts/rspec_helpers.sh
View file @
cde6c996
...
...
@@ -75,6 +75,16 @@ function rspec_simple_job() {
bin/rspec
-Ispec
-rspec_helper
--color
--format
documentation
--format
RspecJunitFormatter
--out
junit_rspec.xml
${
rspec_opts
}
}
function
rspec_db_library_code
()
{
local
db_files
=
"spec/lib/gitlab/database/ spec/support/helpers/database/"
if
[[
-d
"ee/"
]]
;
then
db_files
=
"
${
db_files
}
ee/spec/lib/gitlab/database/ ee/spec/lib/ee/gitlab/database_spec.rb"
fi
rspec_simple_job
"--
${
db_files
}
"
}
function
rspec_paralellized_job
()
{
read
-ra
job_name
<<<
"
${
CI_JOB_NAME
}
"
local
test_tool
=
"
${
job_name
[0]
}
"
...
...
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