From 05fd0259da87b56144faf40cb49eca2c32eef085 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Thu, 22 Aug 2019 08:04:39 +0200
Subject: Use the 'needs' keyword for 'package-and-qa-always' job
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 .gitlab/ci/qa.gitlab-ci.yml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml
index 144e5392e55..69b932801ad 100644
--- a/.gitlab/ci/qa.gitlab-ci.yml
+++ b/.gitlab/ci/qa.gitlab-ci.yml
@@ -1,7 +1,8 @@
 .package-and-qa-base:
   image: ruby:2.6-alpine
-  stage: review  # So even if review-deploy failed we can still run this
+  stage: qa
   before_script: []
+  needs: ["build-qa-image", "gitlab:assets:compile pull-cache"]
   dependencies: []
   cache: {}
   variables:
@@ -14,12 +15,16 @@
   only:
     - branches@gitlab-org/gitlab-ce
     - branches@gitlab-org/gitlab-ee
+  except:
+    - master
 
 package-and-qa-manual:
-  extends:
-    - .package-and-qa-base
-    - .no-docs-and-no-qa
+  extends: .package-and-qa-base
   when: manual
+  except:
+    - master
+    - /(^docs[\/-].+|.+-docs$)/
+    - /(^qa[\/-].*|.*-qa$)
 
 package-and-qa:
   extends: .package-and-qa-base
-- 
cgit v1.2.1