summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2019-05-23 17:09:32 +0100
committerWei-Meng Lee <wlee@gitlab.com>2019-05-31 20:50:43 +0800
commitb2952529d1926a9a7922d0d2af72126ef013d626 (patch)
tree000c41ad72c2b430bcbfddbdd7f508607ab95f1e
parentddb0344a8ff43555061a0775875ea38cbebf7c52 (diff)
downloadgitlab-ce-weimeng-email-routing-mysql.tar.gz
Run mysql specs on feature branches againweimeng-email-routing-mysql
-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: