diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-30 12:09:48 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-30 12:09:48 +0000 |
| commit | 96ee4961ce1984902f738ab651b99d2a1f01a65c (patch) | |
| tree | 4add0def83c37189b44a15b203357303bba20582 /.gitlab | |
| parent | 4ac9f1b8eaef29daa484b27a3113505cfa6a6dcb (diff) | |
| download | gitlab-ce-96ee4961ce1984902f738ab651b99d2a1f01a65c.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/frontend.gitlab-ci.yml | 1 | ||||
| -rw-r--r-- | .gitlab/ci/test-metadata.gitlab-ci.yml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml index bbf8a804666..94491f83942 100644 --- a/.gitlab/ci/frontend.gitlab-ci.yml +++ b/.gitlab/ci/frontend.gitlab-ci.yml @@ -132,6 +132,7 @@ rspec frontend_fixture: extends: - .frontend-fixtures-base - .frontend:rules:default-frontend-jobs + parallel: 2 rspec frontend_fixture as-if-foss: extends: diff --git a/.gitlab/ci/test-metadata.gitlab-ci.yml b/.gitlab/ci/test-metadata.gitlab-ci.yml index 135bf8b6a8c..ac719977975 100644 --- a/.gitlab/ci/test-metadata.gitlab-ci.yml +++ b/.gitlab/ci/test-metadata.gitlab-ci.yml @@ -26,6 +26,7 @@ update-tests-metadata: - .test-metadata:rules:update-tests-metadata stage: post-test dependencies: + - retrieve-tests-metadata - setup-test-env - rspec migration pg12 - rspec frontend_fixture |