diff options
Diffstat (limited to '.gitlab/ci/frontend.gitlab-ci.yml')
| -rw-r--r-- | .gitlab/ci/frontend.gitlab-ci.yml | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml index e4c9f85cf62..0b921309ced 100644 --- a/.gitlab/ci/frontend.gitlab-ci.yml +++ b/.gitlab/ci/frontend.gitlab-ci.yml @@ -15,7 +15,7 @@ extends: - .frontend-base - .assets-compile-cache - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.6-git-2.28-lfs-2.9-node-12.18-yarn-1.22-graphicsmagick-1.3.34 + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7.2-git-2.29-lfs-2.9-node-12.18-yarn-1.22-graphicsmagick-1.3.34 variables: WEBPACK_VENDOR_DLL: "true" stage: prepare @@ -97,32 +97,41 @@ update-yarn-cache: - .rails-cache - .use-pg11 stage: fixtures - needs: ["setup-test-env", "compile-test-assets"] + needs: ["setup-test-env", "retrieve-tests-metadata", "compile-test-assets"] variables: SETUP_DB: "true" WEBPACK_VENDOR_DLL: "true" script: + - run_timed_command "gem install knapsack --no-document" - run_timed_command "scripts/gitaly-test-build" - run_timed_command "scripts/gitaly-test-spawn" - - run_timed_command "bin/rake frontend:fixtures" + - source ./scripts/rspec_helpers.sh + - rspec_paralellized_job "--tag frontend_fixture" artifacts: name: frontend-fixtures expire_in: 31d when: always paths: - tmp/tests/frontend/ + - knapsack/ -frontend-fixtures: +rspec frontend_fixture: extends: - .frontend-fixtures-base - .frontend:rules:default-frontend-jobs -frontend-fixtures-as-if-foss: +rspec frontend_fixture as-if-foss: extends: - .frontend-fixtures-base - .frontend:rules:default-frontend-jobs-as-if-foss - .as-if-foss +rspec-ee frontend_fixture: + extends: + - .frontend-fixtures-base + - .frontend:rules:default-frontend-jobs + parallel: 2 + .frontend-test-base: extends: - .frontend-base @@ -152,7 +161,8 @@ karma: extends: - .karma-base - .frontend:rules:default-frontend-jobs - needs: ["frontend-fixtures"] + # Don't use `needs` since `rspec-ee frontend_fixture` doesn't exist in `gitlab-foss` pipelines. + dependencies: ["rspec frontend_fixture", "rspec-ee frontend_fixture"] coverage: '/^Statements *: (\d+\.\d+%)/' artifacts: name: coverage-javascript @@ -171,7 +181,7 @@ karma-as-if-foss: - .karma-base - .frontend:rules:default-frontend-jobs-as-if-foss - .as-if-foss - needs: ["frontend-fixtures-as-if-foss"] + needs: ["rspec frontend_fixture as-if-foss"] .jest-base: extends: .frontend-test-base @@ -183,7 +193,8 @@ jest: extends: - .jest-base - .frontend:rules:default-frontend-jobs - needs: ["frontend-fixtures"] + # Don't use `needs` since `rspec-ee frontend_fixture` doesn't exist in `gitlab-foss` pipelines. + dependencies: ["rspec frontend_fixture", "rspec-ee frontend_fixture"] artifacts: name: coverage-frontend expire_in: 31d @@ -203,14 +214,15 @@ jest-integration: script: - *yarn-install - run_timed_command "yarn jest:integration --ci" - needs: ["frontend-fixtures"] + # Don't use `needs` since `rspec-ee frontend_fixture` doesn't exist in `gitlab-foss` pipelines. + dependencies: ["rspec frontend_fixture", "rspec-ee frontend_fixture"] jest-as-if-foss: extends: - .jest-base - .frontend:rules:default-frontend-jobs-as-if-foss - .as-if-foss - needs: ["frontend-fixtures-as-if-foss"] + needs: ["rspec frontend_fixture as-if-foss"] parallel: 2 coverage-frontend: |