diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-08-04 17:27:26 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-08-04 17:27:26 +0000 |
| commit | 017550d482b0035dbec3ae93f8b0c73839772464 (patch) | |
| tree | 4fce3cc9b9a79eae8cd0f1503163f1daa60ebdf5 | |
| parent | f637c42d46bf7c67d2c2e77b671f4764b4aa441d (diff) | |
| parent | ad838ea6aa38afda4f7d7e4249bd718f27a34c9b (diff) | |
| download | gitlab-ce-017550d482b0035dbec3ae93f8b0c73839772464.tar.gz | |
Merge branch 'do-not-test-mysql-in-ee-non-master-or-stable' into 'master'
Since mysql is not a priority anymore, test it less
See merge request !13320
| -rw-r--r-- | .gitlab-ci.yml | 12 |
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 |