diff options
Diffstat (limited to '.gitlab/ci/qa.gitlab-ci.yml')
| -rw-r--r-- | .gitlab/ci/qa.gitlab-ci.yml | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml index ac2a70dda0b..caa7d18c1ee 100644 --- a/.gitlab/ci/qa.gitlab-ci.yml +++ b/.gitlab/ci/qa.gitlab-ci.yml @@ -1,7 +1,6 @@ .package-and-qa-base: image: ruby:2.6-alpine stage: qa - needs: ["build-qa-image", "gitlab:assets:compile pull-cache"] dependencies: [] variables: GIT_DEPTH: "1" @@ -20,14 +19,24 @@ package-and-qa-manual: extends: - .package-and-qa-base - .except-docs-qa - when: manual except: - - master - - /(^docs[\/-].+|.+-docs$)/ - - /(^qa[\/-].*|.*-qa$) + refs: + - master + needs: ["build-qa-image", "gitlab:assets:compile pull-cache"] + when: manual + +package-and-qa-manual:master: + extends: + - .package-and-qa-base + needs: ["build-qa-image", "gitlab:assets:compile"] + only: + refs: + - master + when: manual package-and-qa: extends: .package-and-qa-base + needs: ["build-qa-image", "gitlab:assets:compile pull-cache"] allow_failure: true only: - /(^qa[\/-].*|.*-qa$)/@gitlab-org/gitlab-ce |