summaryrefslogtreecommitdiff
path: root/.gitlab/ci/qa.gitlab-ci.yml
diff options
context:
space:
mode:
authorMarcel Amirault <mamirault@gitlab.com>2019-08-22 11:56:14 +0000
committerRémy Coutable <remy@rymai.me>2019-08-22 11:56:14 +0000
commitd936e8644c0e6c46fdc0123baa325a3607617757 (patch)
tree70bde725fdab9abcdf1ffe9f1b9c16abee964062 /.gitlab/ci/qa.gitlab-ci.yml
parente84f5a673e254c1e7084821a6d7c6ba919679aa5 (diff)
downloadgitlab-ce-d936e8644c0e6c46fdc0123baa325a3607617757.tar.gz
Add docs exceptions to two pipeline jobs
Diffstat (limited to '.gitlab/ci/qa.gitlab-ci.yml')
-rw-r--r--.gitlab/ci/qa.gitlab-ci.yml10
1 files changed, 5 insertions, 5 deletions
diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml
index dcc681294d2..144e5392e55 100644
--- a/.gitlab/ci/qa.gitlab-ci.yml
+++ b/.gitlab/ci/qa.gitlab-ci.yml
@@ -15,13 +15,13 @@
- branches@gitlab-org/gitlab-ce
- branches@gitlab-org/gitlab-ee
-package-and-qa:
- extends: .package-and-qa-base
+package-and-qa-manual:
+ extends:
+ - .package-and-qa-base
+ - .no-docs-and-no-qa
when: manual
- except:
- - /(^qa[\/-].*|.*-qa$)/
-package-and-qa-always:
+package-and-qa:
extends: .package-and-qa-base
allow_failure: true
only: