Commit a760f445 authored by Thong Kuah's avatar Thong Kuah

Fix db CI jobs for FOSS

The geo database does not exist in FOSS, so the FOSS db jobs must run
using the single database variant
parent 60cd1b1f
...@@ -342,8 +342,9 @@ rspec fast_spec_helper minimal: ...@@ -342,8 +342,9 @@ rspec fast_spec_helper minimal:
db:rollback: db:rollback:
extends: .db-job-base extends: .db-job-base
script: script:
- bundle exec rake db:migrate:main VERSION=20181228175414 - if [[ -d "ee/" ]]; then task="db:migrate:main"; else task="db:migrate"; fi
- bundle exec rake db:migrate:main SKIP_SCHEMA_VERSION_CHECK=true - bundle exec rake "${task}" VERSION=20181228175414
- bundle exec rake "${task}" SKIP_SCHEMA_VERSION_CHECK=true
db:migrate:reset: db:migrate:reset:
extends: .db-job-base extends: .db-job-base
...@@ -368,7 +369,8 @@ db:migrate-from-previous-major-version: ...@@ -368,7 +369,8 @@ db:migrate-from-previous-major-version:
- git checkout -f $CI_COMMIT_SHA - git checkout -f $CI_COMMIT_SHA
- SETUP_DB=false USE_BUNDLE_INSTALL=true bash scripts/prepare_build.sh - SETUP_DB=false USE_BUNDLE_INSTALL=true bash scripts/prepare_build.sh
script: script:
- run_timed_command "bundle exec rake db:migrate:main" - if [[ -d "ee/" ]]; then task="db:migrate:main"; else task="db:migrate"; fi
- run_timed_command "bundle exec rake ${task}"
db:check-schema: db:check-schema:
extends: extends:
...@@ -377,7 +379,8 @@ db:check-schema: ...@@ -377,7 +379,8 @@ db:check-schema:
variables: variables:
TAG_TO_CHECKOUT: "v14.4.0" TAG_TO_CHECKOUT: "v14.4.0"
script: script:
- run_timed_command "bundle exec rake db:migrate:main" - if [[ -d "ee/" ]]; then task="db:migrate:main"; else task="db:migrate"; fi
- run_timed_command "bundle exec rake ${task}"
- scripts/schema_changed.sh - scripts/schema_changed.sh
- scripts/validate_migration_timestamps - scripts/validate_migration_timestamps
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment