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
ca03e750
Commit
ca03e750
authored
Nov 02, 2021
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ci: Make 'rspec:coverage' depend on RSpec minimal jobs
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
f431f18e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
11 deletions
+22
-11
.gitlab/ci/rails.gitlab-ci.yml
.gitlab/ci/rails.gitlab-ci.yml
+22
-11
No files found.
.gitlab/ci/rails.gitlab-ci.yml
View file @
ca03e750
...
...
@@ -6,11 +6,6 @@
-
.default-before_script
-
.rails-cache
.minimal-bundle-install
:
script
:
-
export BUNDLE_WITHOUT="${BUNDLE_WITHOUT}:default:test:puma:kerberos:metrics:omnibus:ed25519"
-
bundle_install_script
.base-script
:
script
:
# Only install knapsack after bundle install! Otherwise oddly some native
...
...
@@ -241,11 +236,11 @@ update-gitaly-binaries-cache:
.coverage-base
:
extends
:
-
.default-retry
-
.default-before_script
-
.coverage-cache
variables
:
SETUP_DB
:
"
false"
USE_BUNDLE_INSTALL
:
"
false"
before_script
:
-
source scripts/utils.sh
-
export BUNDLE_WITHOUT="${BUNDLE_WITHOUT}:default:test:puma:kerberos:metrics:omnibus:ed25519"
-
bundle_install_script
rspec migration pg12
:
extends
:
...
...
@@ -476,21 +471,38 @@ rspec:coverage:
# so we use `dependencies` here.
dependencies
:
-
setup-test-env
# FOSS/EE jobs
-
rspec migration pg12
-
rspec unit pg12
-
rspec integration pg12
-
rspec system pg12
# FOSS/EE minimal jobs
-
rspec migration pg12 minimal
-
rspec unit pg12 minimal
-
rspec integration pg12 minimal
-
rspec system pg12 minimal
# EE jobs
-
rspec-ee migration pg12
-
rspec-ee unit pg12
-
rspec-ee integration pg12
-
rspec-ee system pg12
# EE minimal jobs
-
rspec-ee migration pg12 minimal
-
rspec-ee unit pg12 minimal
-
rspec-ee integration pg12 minimal
-
rspec-ee system pg12 minimal
# Geo jobs
-
rspec-ee unit pg12 geo
-
rspec-ee integration pg12 geo
-
rspec-ee system pg12 geo
# Geo minimal jobs
-
rspec-ee unit pg12 geo minimal
-
rspec-ee integration pg12 geo minimal
-
rspec-ee system pg12 geo minimal
# Memory jobs
-
memory-static
-
memory-on-boot
script
:
-
!reference
[
.minimal-bundle-install
,
script
]
-
run_timed_command "bundle exec scripts/merge-simplecov"
-
run_timed_command "bundle exec scripts/gather-test-memory-data"
coverage
:
'
/LOC
\((\d+\.\d+%)\)
covered.$/'
...
...
@@ -515,7 +527,6 @@ rspec:feature-flags:
-
job
:
"
haml-lint
ee"
optional
:
true
script
:
-
!reference
[
.minimal-bundle-install
,
script
]
-
if [ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]; then
run_timed_command "bundle exec scripts/used-feature-flags" || (scripts/slack master-broken "☠️ \`${CI_JOB_NAME}\` failed! ☠️ See ${CI_JOB_URL}" ci_failing "GitLab Bot" && exit 1);
else
...
...
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