diff options
Diffstat (limited to '.gitlab/ci/frontend.gitlab-ci.yml')
| -rw-r--r-- | .gitlab/ci/frontend.gitlab-ci.yml | 37 |
1 files changed, 5 insertions, 32 deletions
diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml index 45a6a177943..b00d2f46088 100644 --- a/.gitlab/ci/frontend.gitlab-ci.yml +++ b/.gitlab/ci/frontend.gitlab-ci.yml @@ -113,37 +113,6 @@ compile-assets pull-cache: - master@gitlab-org/gitlab-ee - /(^docs[\/-].*|.*-docs$)/ -gitlab:ui:visual: - extends: .dedicated-runner - before_script: [] - allow_failure: true - dependencies: - - compile-assets - - compile-assets pull-cache - script: - # Remove node modules from GitLab that may conflict with gitlab-ui - - rm -r node_modules - - git clone https://gitlab.com/gitlab-org/gitlab-ui.git - - cp public/assets/application-*.css gitlab-ui/styles/application.css - - cd gitlab-ui - - yarn install - - CSS_URL=./application.css yarn test - only: - changes: - - app/assets/stylesheets/*.scss - - app/assets/stylesheets/**/*.scss - - app/assets/stylesheets/**/**/*.scss - except: - refs: - - /(^docs[\/-].*|.*-docs$)/ - - master - variables: - - $CI_COMMIT_MESSAGE =~ /\[skip visual\]/i - artifacts: - paths: - - gitlab-ui/tests/__image_snapshots__/ - when: always - karma: extends: .dedicated-no-docs-pull-cache-job <<: *use-pg @@ -168,6 +137,8 @@ karma: paths: - chrome_debug.log - coverage-javascript/ + - tmp/tests/frontend/ +# see https://gitlab.com/gitlab-org/gitlab-ce/issues/64756 # reports: # junit: junit_karma.xml @@ -181,7 +152,7 @@ jest: script: - scripts/gitaly-test-spawn - date - - bundle exec rake karma:fixtures + - bundle exec rake frontend:fixtures - date - yarn jest --ci --coverage artifacts: @@ -191,6 +162,8 @@ jest: paths: - coverage-frontend/ - junit_jest.xml + - tmp/tests/frontend/ +# see https://gitlab.com/gitlab-org/gitlab-ce/issues/64756 # reports: # junit: junit_jest.xml cache: |