summaryrefslogtreecommitdiff
path: root/.gitlab
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2019-09-03 13:21:42 +0200
committerRémy Coutable <remy@rymai.me>2019-09-03 14:18:33 +0200
commit3ca11aefdd97c237499004a88ee62e7839eadf3b (patch)
tree378b35059d132307be3a94469e1873f8830cb065 /.gitlab
parentda0a5c7cc20194b71c41bd5572717fd9ac382cf4 (diff)
downloadgitlab-ce-3ca11aefdd97c237499004a88ee62e7839eadf3b.tar.gz
Remove a useless '.except-docs-qa' extension in 'package-and-qa-manual'qa-remove-unneeded-only-extend
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to '.gitlab')
-rw-r--r--.gitlab/ci/qa.gitlab-ci.yml25
-rw-r--r--.gitlab/ci/review.gitlab-ci.yml2
2 files changed, 12 insertions, 15 deletions
diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml
index caa7d18c1ee..8628e1e0a14 100644
--- a/.gitlab/ci/qa.gitlab-ci.yml
+++ b/.gitlab/ci/qa.gitlab-ci.yml
@@ -10,34 +10,31 @@
- install_gitlab_gem
- ./scripts/trigger-build omnibus
only:
- - branches@gitlab-org/gitlab-ce
- - branches@gitlab-org/gitlab-ee
- except:
- - master
+ refs:
+ - branches@gitlab-org/gitlab-ce
+ - branches@gitlab-org/gitlab-ee
package-and-qa-manual:
- extends:
- - .package-and-qa-base
- - .except-docs-qa
+ extends: .package-and-qa-base
except:
refs:
- master
- needs: ["build-qa-image", "gitlab:assets:compile pull-cache"]
when: manual
+ needs: ["build-qa-image", "gitlab:assets:compile pull-cache"]
package-and-qa-manual:master:
- extends:
- - .package-and-qa-base
- needs: ["build-qa-image", "gitlab:assets:compile"]
+ extends: .package-and-qa-base
only:
refs:
- master
when: manual
+ needs: ["build-qa-image", "gitlab:assets:compile"]
package-and-qa:
extends: .package-and-qa-base
+ only:
+ refs:
+ - /(^qa[\/-].*|.*-qa$)/@gitlab-org/gitlab-ce
+ - /(^qa[\/-].*|.*-qa$)/@gitlab-org/gitlab-ee
needs: ["build-qa-image", "gitlab:assets:compile pull-cache"]
allow_failure: true
- only:
- - /(^qa[\/-].*|.*-qa$)/@gitlab-org/gitlab-ce
- - /(^qa[\/-].*|.*-qa$)/@gitlab-org/gitlab-ee
diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml
index 360e4433e57..c4a81a021a9 100644
--- a/.gitlab/ci/review.gitlab-ci.yml
+++ b/.gitlab/ci/review.gitlab-ci.yml
@@ -40,7 +40,7 @@
build-qa-image:
extends:
- .review-docker
- - .except-docs-qa
+ - .except-docs
only:
refs:
- branches@gitlab-org/gitlab-ce