diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-08-25 08:39:55 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-08-25 08:39:55 +0000 |
| commit | 65c223ae836925a056c86b92351cea85aa26e9ef (patch) | |
| tree | b40f6adbb8a07eaa108b3ec2ff1b46b09706cea3 /doc/development | |
| parent | b6af009a3e28b4c8b06a4919051d02bb44aba84f (diff) | |
| download | gitlab-ce-65c223ae836925a056c86b92351cea85aa26e9ef.tar.gz | |
Revert "Merge branch 'mk-reenable-mysql-tests-on-all-branches' into 'master'"
This reverts merge request !13812
Diffstat (limited to 'doc/development')
| -rw-r--r-- | doc/development/testing.md | 5 |
1 files changed, 4 insertions, 1 deletions
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. |