Skip to content

Commit 9f7f785

Browse files
committed
Reenable MySQL tests on all branches
To protect master from surprise failures, as long as we continue to support MySQL.
1 parent 4428944 commit 9f7f785

File tree

2 files changed

+1
-19
lines changed

2 files changed

+1
-19
lines changed

.gitlab-ci.yml

-15
Original file line numberDiff line numberDiff line change
@@ -68,19 +68,6 @@ stages:
6868
- mysql:latest
6969
- redis:alpine
7070

71-
.only-if-want-mysql: &only-if-want-mysql
72-
only:
73-
- /mysql/
74-
- /-stable/
75-
- master@gitlab-org/gitlab-ce
76-
- master@gitlab-org/gitlab-ee
77-
- master@gitlab/gitlabhq
78-
- master@gitlab/gitlab-ee
79-
- tags@gitlab-org/gitlab-ce
80-
- tags@gitlab-org/gitlab-ee
81-
- tags@gitlab/gitlabhq
82-
- tags@gitlab/gitlab-ee
83-
8471
# Skip all jobs except the ones that begin with 'docs/'.
8572
# Used for commits including ONLY documentation changes.
8673
# https://docs.gitlab.com/ce/development/writing_documentation.html#testing
@@ -124,7 +111,6 @@ stages:
124111
.rspec-metadata-mysql: &rspec-metadata-mysql
125112
<<: *rspec-metadata
126113
<<: *use-mysql
127-
<<: *only-if-want-mysql
128114
<<: *except-docs
129115

130116
.spinach-metadata: &spinach-metadata
@@ -156,7 +142,6 @@ stages:
156142
.spinach-metadata-mysql: &spinach-metadata-mysql
157143
<<: *spinach-metadata
158144
<<: *use-mysql
159-
<<: *only-if-want-mysql
160145
<<: *except-docs
161146

162147
.only-canonical-masters: &only-canonical-masters

doc/development/testing.md

+1-4
Original file line numberDiff line numberDiff line change
@@ -529,10 +529,7 @@ slowest test files and try to improve them.
529529

530530
## CI setup
531531

532-
- On CE, the test suite only runs against PostgreSQL by default. We additionally
533-
run the suite against MySQL for tags, `master`, and any branch that includes
534-
`mysql` in the name.
535-
- On EE, the test suite always runs both PostgreSQL and MySQL.
532+
- On CE and EE, the test suite runs both PostgreSQL and MySQL.
536533
- Rails logging to `log/test.log` is disabled by default in CI [for
537534
performance reasons][logging]. To override this setting, provide the
538535
`RAILS_ENABLE_TEST_LOG` environment variable.

0 commit comments

Comments
 (0)