diff options
Diffstat (limited to '.gitlab/ci')
| -rw-r--r-- | .gitlab/ci/qa.gitlab-ci.yml | 10 | ||||
| -rw-r--r-- | .gitlab/ci/review.gitlab-ci.yml | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml index dcc681294d2..144e5392e55 100644 --- a/.gitlab/ci/qa.gitlab-ci.yml +++ b/.gitlab/ci/qa.gitlab-ci.yml @@ -15,13 +15,13 @@ - branches@gitlab-org/gitlab-ce - branches@gitlab-org/gitlab-ee -package-and-qa: - extends: .package-and-qa-base +package-and-qa-manual: + extends: + - .package-and-qa-base + - .no-docs-and-no-qa when: manual - except: - - /(^qa[\/-].*|.*-qa$)/ -package-and-qa-always: +package-and-qa: extends: .package-and-qa-base allow_failure: true only: diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml index 78431e3d842..beb049c0b3b 100644 --- a/.gitlab/ci/review.gitlab-ci.yml +++ b/.gitlab/ci/review.gitlab-ci.yml @@ -171,7 +171,9 @@ review-qa-all: - gitlab-qa Test::Instance::Any "${QA_IMAGE}" "${CI_ENVIRONMENT_URL}" -- --format RspecJunitFormatter --out tmp/rspec-${CI_JOB_ID}.xml --format html --out tmp/rspec.htm --color --format documentation parallel-spec-reports: - extends: .dedicated-runner + extends: + - .dedicated-runner + - .no-docs dependencies: - review-qa-all image: ruby:2.6-alpine |