summaryrefslogtreecommitdiff
path: root/.gitlab/ci/qa.gitlab-ci.yml
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2019-09-03 09:09:34 +0200
committerRémy Coutable <remy@rymai.me>2019-09-03 09:22:12 +0200
commita22646af745aef4f32be600428e8c2aecf9a0954 (patch)
tree23f8ad3970c9fd1a8e080cde2ebcef9149bfa56f /.gitlab/ci/qa.gitlab-ci.yml
parentabd9e842720fc434c643cfe3f1662923c92f68f3 (diff)
downloadgitlab-ce-a22646af745aef4f32be600428e8c2aecf9a0954.tar.gz
Ensure 'build-qa-image' is created for all pipelines except docs & qacreate-build-qa-image-for-all-pipelines
This also makes 'package-and-qa-manual' created for 'master' because it's a valid use-case to run manual QA on 'master'. Without this change, no pipeline could be created for auto-deploy branches due to the following error: The form contains the following error: package-and-qa-manual: needs 'build-qa-image' Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to '.gitlab/ci/qa.gitlab-ci.yml')
-rw-r--r--.gitlab/ci/qa.gitlab-ci.yml4
1 files changed, 0 insertions, 4 deletions
diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml
index ac2a70dda0b..6da28852291 100644
--- a/.gitlab/ci/qa.gitlab-ci.yml
+++ b/.gitlab/ci/qa.gitlab-ci.yml
@@ -21,10 +21,6 @@ package-and-qa-manual:
- .package-and-qa-base
- .except-docs-qa
when: manual
- except:
- - master
- - /(^docs[\/-].+|.+-docs$)/
- - /(^qa[\/-].*|.*-qa$)
package-and-qa:
extends: .package-and-qa-base