diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-06 09:10:11 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-06 09:10:11 +0300 |
| commit | 92bd840b61c7963eb54e0c8de12618b8fe22b715 (patch) | |
| tree | 97cd6cbd58aaa7b15652350827a19d8f4c3a67e5 /.gitlab | |
| parent | b1e7ea9111b4c466c30202464ad3172219e865a9 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/rails.gitlab-ci.yml | 14 | ||||
| -rw-r--r-- | .gitlab/ci/rules.gitlab-ci.yml | 2 |
2 files changed, 14 insertions, 2 deletions
diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml index f5e12f0730c..516816fab56 100644 --- a/.gitlab/ci/rails.gitlab-ci.yml +++ b/.gitlab/ci/rails.gitlab-ci.yml @@ -392,6 +392,20 @@ rspec:deprecations: - .rails:rules:deprecations stage: post-test allow_failure: true + # We cannot use needs since it would mean needing 84 jobs (since most are parallelized) + # so we use `dependencies` here. + dependencies: + - rspec migration pg11 + - rspec unit pg11 + - rspec integration pg11 + - rspec system pg11 + - rspec-ee migration pg11 + - rspec-ee unit pg11 + - rspec-ee integration pg11 + - rspec-ee system pg11 + - rspec-ee unit pg11 geo + - rspec-ee integration pg11 geo + - rspec-ee system pg11 geo variables: SETUP_DB: "false" script: diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 74f8dba8036..43e7b7ab745 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -835,8 +835,6 @@ rules: - <<: *if-not-ee when: never - - <<: *if-merge-request - changes: *code-backstage-patterns - <<: *if-master-schedule-nightly - <<: *if-merge-request-title-run-all-rspec |