summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2017-08-04 23:54:43 +0800
committerLin Jen-Shin <godfat@godfat.org>2017-08-04 23:54:43 +0800
commitad838ea6aa38afda4f7d7e4249bd718f27a34c9b (patch)
tree560189566689e5e46fe8546df12a2b84d557a647 /.gitlab-ci.yml
parent7e45159f0d8b2e0b6963f40f1a2a54ec1171a2c0 (diff)
downloadgitlab-ce-ad838ea6aa38afda4f7d7e4249bd718f27a34c9b.tar.gz
Since mysql is not a priority anymore, test it lessdo-not-test-mysql-in-ee-non-master-or-stable
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml12
1 files changed, 7 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 27fdf6ca0b5..f55bdc19eec 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -66,16 +66,18 @@ stages:
- mysql:latest
- redis:alpine
-.only-master-and-ee-or-mysql: &only-master-and-ee-or-mysql
+.only-if-want-mysql: &only-if-want-mysql
only:
- /mysql/
- /-stable/
- master@gitlab-org/gitlab-ce
+ - master@gitlab-org/gitlab-ee
- master@gitlab/gitlabhq
+ - master@gitlab/gitlab-ee
- tags@gitlab-org/gitlab-ce
+ - tags@gitlab-org/gitlab-ee
- tags@gitlab/gitlabhq
- - //@gitlab-org/gitlab-ee
- - //@gitlab/gitlab-ee
+ - tags@gitlab/gitlab-ee
# Skip all jobs except the ones that begin with 'docs/'.
# Used for commits including ONLY documentation changes.
@@ -114,7 +116,7 @@ stages:
.rspec-knapsack-mysql: &rspec-knapsack-mysql
<<: *rspec-knapsack
<<: *use-mysql
- <<: *only-master-and-ee-or-mysql
+ <<: *only-if-want-mysql
<<: *except-docs
.spinach-knapsack: &spinach-knapsack
@@ -146,7 +148,7 @@ stages:
.spinach-knapsack-mysql: &spinach-knapsack-mysql
<<: *spinach-knapsack
<<: *use-mysql
- <<: *only-master-and-ee-or-mysql
+ <<: *only-if-want-mysql
<<: *except-docs
.only-canonical-masters: &only-canonical-masters