diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-09-03 11:07:07 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-09-03 11:07:27 +0200 |
| commit | fb51de2e496bb37974eaec0a47720fddb149c488 (patch) | |
| tree | 7581dec8f480817ebc9830c88dcfb334491ddfde /.gitlab | |
| parent | a22646af745aef4f32be600428e8c2aecf9a0954 (diff) | |
| download | gitlab-ce-fb51de2e496bb37974eaec0a47720fddb149c488.tar.gz | |
Introduce a new 'package-and-qa-manual:master' job
This is needed because in `master`, the `gitlab:assets:compile` is
created, but not the `gitlab:assets:compile pull-cache` job, and the
`needs` keyword cannot take jobs that don't exist, thus we have to
create a dedicated job for `master`, with `needs: ["build-qa-image",
"gitlab:assets:compile"]` instead of `needs: ["build-qa-image",
"gitlab:assets:compile pull-cache"]`.
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/qa.gitlab-ci.yml | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml index 6da28852291..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,10 +19,24 @@ package-and-qa-manual: extends: - .package-and-qa-base - .except-docs-qa + except: + 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 |