summaryrefslogtreecommitdiff
path: root/.gitlab
diff options
context:
space:
mode:
authorMark Lapierre <mlapierre@gitlab.com>2019-08-01 10:23:15 +0000
committerRémy Coutable <remy@rymai.me>2019-08-01 10:23:15 +0000
commitd2083f8b3495b466ea563cdafccce4cfbfebc2b4 (patch)
tree8e6370c2005e4f7d3941a98beb7bb6c24d760437 /.gitlab
parent13bdd026eaf260a4fb45dbd02146c2f751b146cb (diff)
downloadgitlab-ce-d2083f8b3495b466ea563cdafccce4cfbfebc2b4.tar.gz
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: []`
Diffstat (limited to '.gitlab')
-rw-r--r--.gitlab/ci/qa.gitlab-ci.yml20
1 files changed, 16 insertions, 4 deletions
diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml
index ee9e467886a..dcc681294d2 100644
--- a/.gitlab/ci/qa.gitlab-ci.yml
+++ b/.gitlab/ci/qa.gitlab-ci.yml
@@ -1,7 +1,6 @@
-package-and-qa:
+.package-and-qa-base:
image: ruby:2.6-alpine
stage: review # So even if review-deploy failed we can still run this
- when: manual
before_script: []
dependencies: []
cache: {}
@@ -13,5 +12,18 @@ package-and-qa:
- install_gitlab_gem
- ./scripts/trigger-build omnibus
only:
- - /.+/@gitlab-org/gitlab-ce
- - /.+/@gitlab-org/gitlab-ee
+ - branches@gitlab-org/gitlab-ce
+ - 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