diff options
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 50 |
1 files changed, 26 insertions, 24 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9eac37df74b..a97414cbba8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -699,6 +699,32 @@ karma: reports: junit: junit_karma.xml +jest: + <<: *dedicated-no-docs-and-no-qa-pull-cache-job + <<: *use-pg + dependencies: + - compile-assets + - setup-test-env + script: + - scripts/gitaly-test-spawn + - date + - bundle exec rake karma:fixtures + - date + - yarn jest --ci --coverage + artifacts: + name: coverage-frontend + expire_in: 31d + when: always + paths: + - coverage-frontend/ + - junit_jest.xml + reports: + junit: junit_jest.xml + cache: + key: jest + paths: + - tmp/jest/jest/ + code_quality: <<: *dedicated-no-docs-no-db-pull-cache-job image: docker:stable @@ -1027,27 +1053,3 @@ schedule:review-cleanup: - gem install gitlab --no-document script: - ruby -rrubygems scripts/review_apps/automated_cleanup.rb - -merge:master: - image: registry.gitlab.com/gitlab-org/merge-train - stage: merge - # The global before_script/after_script blocks break this job, or aren't - # necessary. These two lines result in them being ignored. - before_script: [] - after_script: [] - only: - refs: - - master - - schedules - variables: - - $CI_PROJECT_PATH == "gitlab-org/gitlab-ce" - - $MERGE_TRAIN_SSH_PUBLIC_KEY - - $MERGE_TRAIN_SSH_PRIVATE_KEY - - $MERGE_TRAIN_API_TOKEN - - $MERGE_FORCE_ENABLE - script: - - scripts/merge-train - cache: - paths: - - gitlab-ee - key: "merge:master" |