diff options
author | Robert Speicher <rspeicher@gmail.com> | 2019-06-19 15:48:48 +0000 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2019-06-19 15:48:48 +0000 |
commit | e66faa63ea8bcc69be49cb6975b6555cb54000b3 (patch) | |
tree | 9827a87b782758c74751c05bc3b3ec73282867a6 /.gitlab | |
parent | 49480d8e0556d2dc96b0b460ef749c60d5231ebb (diff) | |
parent | 8802dd24ecf17fa90b3e0200a05224297fa0f462 (diff) | |
download | gitlab-ce-e66faa63ea8bcc69be49cb6975b6555cb54000b3.tar.gz |
Merge branch '52442-minimal-remove-mysql-support' into 'master'
Only support postgresql (minimal version)
See merge request gitlab-org/gitlab-ce!29790
Diffstat (limited to '.gitlab')
-rw-r--r-- | .gitlab/ci/rails.gitlab-ci.yml | 69 |
1 files changed, 0 insertions, 69 deletions
diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml index 8534b15e16b..529a0de696b 100644 --- a/.gitlab/ci/rails.gitlab-ci.yml +++ b/.gitlab/ci/rails.gitlab-ci.yml @@ -10,11 +10,6 @@ command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"] - name: redis:alpine -.use-mysql: &use-mysql - services: - - mysql:5.7 - - redis:alpine - .only-schedules-master: &only-schedules-master only: - schedules@gitlab-org/gitlab-ce @@ -94,10 +89,6 @@ <<: *use-pg-10 image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.6.3-golang-1.11-git-2.21-chrome-73.0-node-12.x-yarn-1.16-postgresql-10-graphicsmagick-1.3.29" -.rspec-metadata-mysql: &rspec-metadata-mysql - <<: *rspec-metadata - <<: *use-mysql - # DB migration, rollback, and seed jobs .db-migrate-reset: &db-migrate-reset extends: .dedicated-no-docs-and-no-qa-pull-cache-job @@ -173,42 +164,6 @@ rspec system pg-10: <<: *only-schedules-master parallel: 24 -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: <<: *rspec-metadata-pg script: @@ -226,12 +181,6 @@ rspec quarantine pg: <<: *rspec-quarantine allow_failure: true -rspec quarantine mysql: - <<: *rspec-metadata-mysql - <<: *rspec-quarantine - <<: *only-schedules-master - allow_failure: true - static-analysis: extends: .dedicated-no-docs-no-db-pull-cache-job dependencies: @@ -281,10 +230,6 @@ db:migrate:reset-pg: <<: *db-migrate-reset <<: *use-pg -db:migrate:reset-mysql: - <<: *db-migrate-reset - <<: *use-mysql - db:check-schema-pg: <<: *db-migrate-reset <<: *use-pg @@ -295,10 +240,6 @@ migration:path-pg: <<: *migration-paths <<: *use-pg -migration:path-mysql: - <<: *migration-paths - <<: *use-mysql - .db-rollback: &db-rollback extends: .dedicated-no-docs-and-no-qa-pull-cache-job script: @@ -311,22 +252,12 @@ db:rollback-pg: <<: *db-rollback <<: *use-pg -db:rollback-mysql: - <<: *db-rollback - <<: *use-mysql - gitlab:setup-pg: <<: *gitlab-setup <<: *use-pg dependencies: - setup-test-env -gitlab:setup-mysql: - <<: *gitlab-setup - <<: *use-mysql - dependencies: - - setup-test-env - coverage: # Don't include dedicated-no-docs-no-db-pull-cache-job here since we need to # download artifacts from all the rspec jobs instead of from setup-test-env only |