diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-06 15:10:04 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-06 15:10:04 +0000 |
| commit | f3b1e07903a7f509b11ad7cf188fac46d98f77f6 (patch) | |
| tree | a6fa5e65d83d94334387952f1f526ed438604408 /.gitlab/ci/frontend.gitlab-ci.yml | |
| parent | ba174c982f40d71a87fd511b091753807174f7e7 (diff) | |
| download | gitlab-ce-f3b1e07903a7f509b11ad7cf188fac46d98f77f6.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab/ci/frontend.gitlab-ci.yml')
| -rw-r--r-- | .gitlab/ci/frontend.gitlab-ci.yml | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml index a02d76c4698..d1fe9c6241d 100644 --- a/.gitlab/ci/frontend.gitlab-ci.yml +++ b/.gitlab/ci/frontend.gitlab-ci.yml @@ -135,13 +135,9 @@ compile-assets pull-cache as-if-foss: - .default-retry - .default-cache - .default-before_script - - .use-pg9 + - .use-pg10 stage: fixtures - needs: - - job: "setup-test-env" - artifacts: true - - job: "compile-assets pull-cache" - artifacts: true + needs: ["setup-test-env pg10", "compile-assets pull-cache"] script: - date - scripts/gitaly-test-spawn @@ -270,7 +266,6 @@ coverage-frontend: .qa-frontend-node: extends: - .default-retry - - .default-cache - .frontend:rules:qa-frontend-node stage: test dependencies: [] @@ -300,7 +295,7 @@ webpack-dev-server: - .default-cache - .frontend:rules:default-frontend-jobs stage: test - needs: ["setup-test-env", "compile-assets pull-cache"] + needs: ["setup-test-env pg10", "compile-assets pull-cache"] variables: WEBPACK_MEMORY_TEST: "true" WEBPACK_VENDOR_DLL: "true" |