diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2018-12-05 12:32:32 +0100 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2018-12-05 12:32:32 +0100 |
| commit | caf33ea057193a472005fab4f2e8b8bfd2c1a2cd (patch) | |
| tree | 73d54465efc0cd78b5738db41c49092b93557701 /.gitlab-ci.yml | |
| parent | a2accebb80cea53b864ad3db4023656f9884fbf4 (diff) | |
| parent | 5ea6b08e7c223fe9ca9d12f62e83a847d065bb42 (diff) | |
| download | gitlab-ce-caf33ea057193a472005fab4f2e8b8bfd2c1a2cd.tar.gz | |
Merge remote-tracking branch 'origin/master' into tatkins-installation-method-docs
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 32 |
1 files changed, 30 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 79ec1b881d4..a97414cbba8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,6 +48,7 @@ after_script: stages: - build - prepare + - merge - test - post-test - pages @@ -666,7 +667,7 @@ gitlab:assets:compile: only: - //@gitlab-org/gitlab-ce - //@gitlab-org/gitlab-ee - - //@gitlab/gitabhq + - //@gitlab/gitlabhq - //@gitlab/gitlab-ee tags: - gitlab-org-delivery @@ -698,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 @@ -978,9 +1005,10 @@ review-deploy: review-qa-smoke: <<: *review-qa-base - retry: 2 + # retry: 2 script: - gitlab-qa Test::Instance::Smoke "${QA_IMAGE}" "${CI_ENVIRONMENT_URL}" + allow_failure: true review-qa-all: <<: *review-qa-base |