summaryrefslogtreecommitdiff
path: root/.gitlab
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2019-08-22 08:04:39 +0200
committerRémy Coutable <remy@rymai.me>2019-08-26 14:48:16 +0200
commit05fd0259da87b56144faf40cb49eca2c32eef085 (patch)
treef7bd892b6eea5acb86f08dead62b1246e1d9cd0e /.gitlab
parent519a130c26d9972ef8504820f3bd2ab1e654c0c4 (diff)
downloadgitlab-ce-05fd0259da87b56144faf40cb49eca2c32eef085.tar.gz
Use the 'needs' keyword for 'package-and-qa-always' job
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to '.gitlab')
-rw-r--r--.gitlab/ci/qa.gitlab-ci.yml13
1 files 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