diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-20 15:08:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-20 15:08:51 +0300 |
commit | 8c4198cbe631278e87fee04157d23494fbb80cdb (patch) | |
tree | d35cf498af480389796fd9e5cb4bcc903aea60f3 /.gitlab/ci/frontend.gitlab-ci.yml | |
parent | 1ac794623a8be5dee111716a44dd04ff708f3541 (diff) |
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 | 54 |
1 files changed, 46 insertions, 8 deletions
diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml index f9db35592aa..d966d88a320 100644 --- a/.gitlab/ci/frontend.gitlab-ci.yml +++ b/.gitlab/ci/frontend.gitlab-ci.yml @@ -120,15 +120,54 @@ compile-assets pull-cache as-if-foss: policy: pull key: "assets-compile:v9:foss" -.frontend-job-base: +.frontend-fixtures-base: extends: - .default-tags - .default-retry - .default-cache - .default-before_script - .use-pg9 + stage: fixtures + needs: + - job: "setup-test-env" + artifacts: true + - job: "compile-assets pull-cache" + artifacts: true + script: + - date + - scripts/gitaly-test-spawn + - date + - bundle exec rake frontend:fixtures + artifacts: + name: frontend-fixtures + expire_in: 31d + when: always + paths: + - node_modules + - public/assets + - tmp/tests/frontend/ + +frontend-fixtures: + extends: + - .frontend-fixtures-base + - .frontend:rules:default-frontend-jobs + +frontend-fixtures-as-if-foss: + extends: + - .frontend-fixtures-base + - .frontend:rules:default-frontend-jobs-as-if-foss + - .as-if-foss + +.frontend-job-base: + extends: + - .default-tags + - .default-retry + - .default-cache + - .default-before_script + variables: + USE_BUNDLE_INSTALL: "false" + SETUP_DB: "false" stage: test - needs: ["setup-test-env", "compile-assets pull-cache"] .karma-base: extends: .frontend-job-base @@ -138,14 +177,13 @@ compile-assets pull-cache as-if-foss: script: - export BABEL_ENV=coverage CHROME_LOG_FILE=chrome_debug.log - date - - scripts/gitaly-test-spawn - - date - - bundle exec rake karma + - yarn karma karma: extends: - .karma-base - .frontend:rules:default-frontend-jobs + needs: ["frontend-fixtures"] coverage: '/^Statements *: (\d+\.\d+%)/' artifacts: name: coverage-javascript @@ -163,13 +201,11 @@ karma-as-if-foss: - .karma-base - .frontend:rules:default-frontend-jobs-as-if-foss - .as-if-foss + needs: ["frontend-fixtures-as-if-foss"] .jest-base: extends: .frontend-job-base script: - - scripts/gitaly-test-spawn - - date - - bundle exec rake frontend:fixtures - date - yarn jest --ci --coverage cache: @@ -182,6 +218,7 @@ jest: extends: - .jest-base - .frontend:rules:default-frontend-jobs + needs: ["frontend-fixtures"] artifacts: name: coverage-frontend expire_in: 31d @@ -198,6 +235,7 @@ jest-as-if-foss: - .jest-base - .frontend:rules:default-frontend-jobs-as-if-foss - .as-if-foss + needs: ["frontend-fixtures-as-if-foss"] cache: policy: pull |