summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2019-05-23 17:09:32 +0100
committerNick Thomas <nick@gitlab.com>2019-05-24 16:44:48 +0100
commit5efae308655f73269dde1f301a4e10cc7749c403 (patch)
treec434de7e533fd680cf4fb4a688749e5b6973d907
parent21c809ce224696a811d6a557c601e6dc2eb27d2f (diff)
downloadgitlab-ce-52442-schedule-mysql-on-feature-branches.tar.gz
Run mysql specs on feature branches again52442-schedule-mysql-on-feature-branches
-rw-r--r--.gitlab/ci/rails.gitlab-ci.yml25
1 files changed, 0 insertions, 25 deletions
diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml
index 3f0c899d704..8ca2b993e7d 100644
--- a/.gitlab/ci/rails.gitlab-ci.yml
+++ b/.gitlab/ci/rails.gitlab-ci.yml
@@ -175,38 +175,14 @@ rspec system pg-10:
rspec unit mysql:
<<: *rspec-metadata-mysql
- <<: *only-schedules-master
parallel: 20
rspec integration mysql:
<<: *rspec-metadata-mysql
- <<: *only-schedules-master
parallel: 6
rspec system mysql:
<<: *rspec-metadata-mysql
- <<: *only-schedules-master
- parallel: 24
-
-.rspec-mysql-on-demand: &rspec-mysql-on-demand
- only:
- variables:
- - $CI_COMMIT_MESSAGE =~ /\[run mysql\]/i
- - $CI_COMMIT_REF_NAME =~ /mysql/
-
-rspec unit mysql on-demand:
- <<: *rspec-metadata-mysql
- <<: *rspec-mysql-on-demand
- parallel: 20
-
-rspec integration mysql on-demand:
- <<: *rspec-metadata-mysql
- <<: *rspec-mysql-on-demand
- parallel: 6
-
-rspec system mysql on-demand:
- <<: *rspec-metadata-mysql
- <<: *rspec-mysql-on-demand
parallel: 24
rspec-fast-spec-helper:
@@ -229,7 +205,6 @@ rspec quarantine pg:
rspec quarantine mysql:
<<: *rspec-metadata-mysql
<<: *rspec-quarantine
- <<: *only-schedules-master
allow_failure: true
static-analysis: