From d2083f8b3495b466ea563cdafccce4cfbfebc2b4 Mon Sep 17 00:00:00 2001
From: Mark Lapierre <mlapierre@gitlab.com>
Date: Thu, 1 Aug 2019 10:23:15 +0000
Subject: [PATCH] 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: []`
---
 .gitlab/ci/qa.gitlab-ci.yml | 20 ++++++++++++++++----
 1 file 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