summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorMichael Kozono <mkozono@gmail.com>2017-08-24 11:45:37 -0700
committerMichael Kozono <mkozono@gmail.com>2017-08-25 11:39:12 -0700
commitc199535d13f7ad20e0ff92e1c24e174cdf38d569 (patch)
tree0862b7586d741506fb38f1bb0f206c6a69820d07 /.gitlab-ci.yml
parent1bfba534a9c00ef739c5f77bd1f99e842ce60fa6 (diff)
downloadgitlab-ce-c199535d13f7ad20e0ff92e1c24e174cdf38d569.tar.gz
Reenable MySQL tests on all branchesmk-reenable-mysql-tests-on-all-branches
To protect master from surprise failures, as long as we continue to support MySQL.
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml15
1 files changed, 0 insertions, 15 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6f356a07576..ab9627d4ab7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -68,19 +68,6 @@ stages:
- mysql:latest
- redis:alpine
-.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
- - tags@gitlab/gitlab-ee
-
# Skip all jobs except the ones that begin with 'docs/'.
# Used for commits including ONLY documentation changes.
# https://docs.gitlab.com/ce/development/writing_documentation.html#testing
@@ -124,7 +111,6 @@ stages:
.rspec-metadata-mysql: &rspec-metadata-mysql
<<: *rspec-metadata
<<: *use-mysql
- <<: *only-if-want-mysql
<<: *except-docs
.spinach-metadata: &spinach-metadata
@@ -156,7 +142,6 @@ stages:
.spinach-metadata-mysql: &spinach-metadata-mysql
<<: *spinach-metadata
<<: *use-mysql
- <<: *only-if-want-mysql
<<: *except-docs
.only-canonical-masters: &only-canonical-masters