diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-26 09:08:47 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-26 09:08:47 +0000 |
| commit | 66d4203791a01fdedf668a78818a229ea2c07aad (patch) | |
| tree | 374fc9f6c5e709cf6ab48e257e6bfe4a504d6bbb /.gitlab | |
| parent | a496f41f60e12a0a5c31482b7594ad547e0ade42 (diff) | |
| download | gitlab-ce-66d4203791a01fdedf668a78818a229ea2c07aad.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/docs.gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | .gitlab/ci/frontend.gitlab-ci.yml | 25 |
2 files changed, 26 insertions, 3 deletions
diff --git a/.gitlab/ci/docs.gitlab-ci.yml b/.gitlab/ci/docs.gitlab-ci.yml index c6f758b6719..d90bf4337e8 100644 --- a/.gitlab/ci/docs.gitlab-ci.yml +++ b/.gitlab/ci/docs.gitlab-ci.yml @@ -44,13 +44,15 @@ docs lint: - .default-tags - .default-retry - .docs:rules:docs-lint - image: "registry.gitlab.com/gitlab-org/gitlab-docs:docs-lint" + image: "registry.gitlab.com/gitlab-org/gitlab-docs:lint" stage: test needs: [] script: - scripts/lint-doc.sh # Lint Markdown - markdownlint --config .markdownlint.json 'doc/**/*.md' + # Lint content (error-level text-scoped rules only) + - vale --minAlertLevel error --ignore-syntax doc # Prepare docs for build - mv doc/ /tmp/gitlab-docs/content/$DOCS_GITLAB_REPO_SUFFIX - cd /tmp/gitlab-docs diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml index d966d88a320..db27c73fd7b 100644 --- a/.gitlab/ci/frontend.gitlab-ci.yml +++ b/.gitlab/ci/frontend.gitlab-ci.yml @@ -207,11 +207,11 @@ karma-as-if-foss: extends: .frontend-job-base script: - date - - yarn jest --ci --coverage + - yarn jest --ci --coverage --testSequencer ./scripts/frontend/parallel_ci_sequencer.js cache: key: jest paths: - - tmp/jest/jest/ + - tmp/cache/jest/ policy: pull-push jest: @@ -229,6 +229,7 @@ jest: - tmp/tests/frontend/ reports: junit: junit_jest.xml + parallel: 2 jest-as-if-foss: extends: @@ -239,6 +240,26 @@ jest-as-if-foss: cache: policy: pull +coverage-frontend: + extends: + - .default-tags + - .default-retry + - .frontend:rules:default-frontend-jobs + needs: ["jest"] + stage: post-test + before_script: + - yarn install --frozen-lockfile --cache-folder .yarn-cache --prefer-offline + script: + - yarn node scripts/frontend/merge_coverage_frontend.js + artifacts: + name: coverage-frontend + expire_in: 31d + paths: + - coverage-frontend/ + cache: + paths: + - .yarn-cache/ + .qa-frontend-node: extends: - .default-tags |