Commit fb51de2e authored by Rémy Coutable's avatar Rémy Coutable

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: default avatarRémy Coutable <remy@rymai.me>
parent a22646af
.package-and-qa-base: .package-and-qa-base:
image: ruby:2.6-alpine image: ruby:2.6-alpine
stage: qa stage: qa
needs: ["build-qa-image", "gitlab:assets:compile pull-cache"]
dependencies: [] dependencies: []
variables: variables:
GIT_DEPTH: "1" GIT_DEPTH: "1"
...@@ -20,10 +19,24 @@ package-and-qa-manual: ...@@ -20,10 +19,24 @@ package-and-qa-manual:
extends: extends:
- .package-and-qa-base - .package-and-qa-base
- .except-docs-qa - .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 when: manual
package-and-qa: package-and-qa:
extends: .package-and-qa-base extends: .package-and-qa-base
needs: ["build-qa-image", "gitlab:assets:compile pull-cache"]
allow_failure: true allow_failure: true
only: only:
- /(^qa[\/-].*|.*-qa$)/@gitlab-org/gitlab-ce - /(^qa[\/-].*|.*-qa$)/@gitlab-org/gitlab-ce
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment