From 65c223ae836925a056c86b92351cea85aa26e9ef Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Fri, 25 Aug 2017 08:39:55 +0000
Subject: Revert "Merge branch 'mk-reenable-mysql-tests-on-all-branches' into
 'master'"

This reverts merge request !13812
---
 .gitlab-ci.yml             | 15 +++++++++++++++
 doc/development/testing.md |  5 ++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ab9627d4ab7..6f356a07576 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -68,6 +68,19 @@ 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
@@ -111,6 +124,7 @@ stages:
 .rspec-metadata-mysql: &rspec-metadata-mysql
   <<: *rspec-metadata
   <<: *use-mysql
+  <<: *only-if-want-mysql
   <<: *except-docs
 
 .spinach-metadata: &spinach-metadata
@@ -142,6 +156,7 @@ stages:
 .spinach-metadata-mysql: &spinach-metadata-mysql
   <<: *spinach-metadata
   <<: *use-mysql
+  <<: *only-if-want-mysql
   <<: *except-docs
 
 .only-canonical-masters: &only-canonical-masters
diff --git a/doc/development/testing.md b/doc/development/testing.md
index 83269303005..efd56484b12 100644
--- a/doc/development/testing.md
+++ b/doc/development/testing.md
@@ -529,7 +529,10 @@ slowest test files and try to improve them.
 
 ## CI setup
 
-- On CE and EE, the test suite runs both PostgreSQL and MySQL.
+- On CE, the test suite only runs against PostgreSQL by default. We additionally
+  run the suite against MySQL for tags, `master`, and any branch that includes
+  `mysql` in the name.
+- On EE, the test suite always runs both PostgreSQL and MySQL.
 - Rails logging to `log/test.log` is disabled by default in CI [for
   performance reasons][logging]. To override this setting, provide the
   `RAILS_ENABLE_TEST_LOG` environment variable.
-- 
cgit v1.2.1