Commit d2083f8b authored by Mark Lapierre's avatar Mark Lapierre Committed by Rémy Coutable

Implement review suggestions

Make package-and-qa manual so the default `on_success` doesn't need
to be set on package-and-qa-always.

Remove unnecessary `except: []`
parent 13bdd026
package-and-qa: .package-and-qa-base:
image: ruby:2.6-alpine image: ruby:2.6-alpine
stage: review # So even if review-deploy failed we can still run this stage: review # So even if review-deploy failed we can still run this
when: manual
before_script: [] before_script: []
dependencies: [] dependencies: []
cache: {} cache: {}
...@@ -13,5 +12,18 @@ package-and-qa: ...@@ -13,5 +12,18 @@ package-and-qa:
- install_gitlab_gem - install_gitlab_gem
- ./scripts/trigger-build omnibus - ./scripts/trigger-build omnibus
only: only:
- /.+/@gitlab-org/gitlab-ce - branches@gitlab-org/gitlab-ce
- /.+/@gitlab-org/gitlab-ee - branches@gitlab-org/gitlab-ee
package-and-qa:
extends: .package-and-qa-base
when: manual
except:
- /(^qa[\/-].*|.*-qa$)/
package-and-qa-always:
extends: .package-and-qa-base
allow_failure: true
only:
- /(^qa[\/-].*|.*-qa$)/@gitlab-org/gitlab-ce
- /(^qa[\/-].*|.*-qa$)/@gitlab-org/gitlab-ee
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