diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-08-25 11:39:21 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-08-25 11:39:21 +0300 |
| commit | b6af009a3e28b4c8b06a4919051d02bb44aba84f (patch) | |
| tree | 8ceeb07c1aaccf2d9f196955bb7e8ae52c2f1ddf /.gitlab-ci.yml | |
| parent | 24244d03b55bc7732b3362bab1e1cc7e04c2dabf (diff) | |
| parent | 9f7f78570f4dba345a71b6d14a08d0430fad8304 (diff) | |
Merge branch 'mk-reenable-mysql-tests-on-all-branches' into 'master'
Reenable MySQL tests on all CE and EE branches
Closes #36384
See merge request !13812
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 15 |
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 |