summaryrefslogtreecommitdiff
path: root/.gitlab/ci
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-04-21 21:09:38 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-04-21 21:09:38 +0000
commit8e180c115da19899960621f8ee77555e81bda7c5 (patch)
tree8fbe98d1a2439a315a55ffed9d32b47126961eef /.gitlab/ci
parentf1d9023a9049ed7defec5566063b7f704c26dfd6 (diff)
downloadgitlab-ce-8e180c115da19899960621f8ee77555e81bda7c5.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab/ci')
-rw-r--r--.gitlab/ci/rules.gitlab-ci.yml4
-rw-r--r--.gitlab/ci/test-metadata.gitlab-ci.yml13
2 files changed, 16 insertions, 1 deletions
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml
index 79ae7823853..5762b258299 100644
--- a/.gitlab/ci/rules.gitlab-ci.yml
+++ b/.gitlab/ci/rules.gitlab-ci.yml
@@ -559,7 +559,9 @@
rules:
- <<: *if-dot-com-ee-schedule
changes: *code-backstage-patterns
- when: on_success
+ - changes:
+ - ".gitlab/ci/test-metadata.gitlab-ci.yml"
+ - "scripts/rspec_helpers.sh"
##############
# YAML rules #
diff --git a/.gitlab/ci/test-metadata.gitlab-ci.yml b/.gitlab/ci/test-metadata.gitlab-ci.yml
index cda6d996bdb..db176b00e08 100644
--- a/.gitlab/ci/test-metadata.gitlab-ci.yml
+++ b/.gitlab/ci/test-metadata.gitlab-ci.yml
@@ -31,6 +31,19 @@ update-tests-metadata:
- .tests-metadata-state
- .test-metadata:rules:update-tests-metadata
stage: post-test
+ dependencies:
+ - setup-test-env pg11
+ - 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
cache:
policy: push
script: