From 65c223ae836925a056c86b92351cea85aa26e9ef Mon Sep 17 00:00:00 2001 From: Douwe Maan 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 --- doc/development/testing.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'doc/development/testing.md') 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.3