Move the DB name at the end of the first jobs' name word and prepend it with a dash
Signed-off-by: Rémy Coutable <remy@rymai.me>
This commit is contained in:
parent
78d8f4af36
commit
6813c9ef51
137
.gitlab-ci.yml
137
.gitlab-ci.yml
|
@ -197,76 +197,75 @@ setup-test-env:
|
|||
- public/assets
|
||||
- tmp/tests
|
||||
|
||||
rspec pg 0 20: *rspec-knapsack-pg
|
||||
rspec pg 1 20: *rspec-knapsack-pg
|
||||
rspec pg 2 20: *rspec-knapsack-pg
|
||||
rspec pg 3 20: *rspec-knapsack-pg
|
||||
rspec pg 4 20: *rspec-knapsack-pg
|
||||
rspec pg 5 20: *rspec-knapsack-pg
|
||||
rspec pg 6 20: *rspec-knapsack-pg
|
||||
rspec pg 7 20: *rspec-knapsack-pg
|
||||
rspec pg 8 20: *rspec-knapsack-pg
|
||||
rspec pg 9 20: *rspec-knapsack-pg
|
||||
rspec pg 10 20: *rspec-knapsack-pg
|
||||
rspec pg 11 20: *rspec-knapsack-pg
|
||||
rspec pg 12 20: *rspec-knapsack-pg
|
||||
rspec pg 13 20: *rspec-knapsack-pg
|
||||
rspec pg 14 20: *rspec-knapsack-pg
|
||||
rspec pg 15 20: *rspec-knapsack-pg
|
||||
rspec pg 16 20: *rspec-knapsack-pg
|
||||
rspec pg 17 20: *rspec-knapsack-pg
|
||||
rspec pg 18 20: *rspec-knapsack-pg
|
||||
rspec pg 19 20: *rspec-knapsack-pg
|
||||
rspec-pg 0 20: *rspec-knapsack-pg
|
||||
rspec-pg 1 20: *rspec-knapsack-pg
|
||||
rspec-pg 2 20: *rspec-knapsack-pg
|
||||
rspec-pg 3 20: *rspec-knapsack-pg
|
||||
rspec-pg 4 20: *rspec-knapsack-pg
|
||||
rspec-pg 5 20: *rspec-knapsack-pg
|
||||
rspec-pg 6 20: *rspec-knapsack-pg
|
||||
rspec-pg 7 20: *rspec-knapsack-pg
|
||||
rspec-pg 8 20: *rspec-knapsack-pg
|
||||
rspec-pg 9 20: *rspec-knapsack-pg
|
||||
rspec-pg 10 20: *rspec-knapsack-pg
|
||||
rspec-pg 11 20: *rspec-knapsack-pg
|
||||
rspec-pg 12 20: *rspec-knapsack-pg
|
||||
rspec-pg 13 20: *rspec-knapsack-pg
|
||||
rspec-pg 14 20: *rspec-knapsack-pg
|
||||
rspec-pg 15 20: *rspec-knapsack-pg
|
||||
rspec-pg 16 20: *rspec-knapsack-pg
|
||||
rspec-pg 17 20: *rspec-knapsack-pg
|
||||
rspec-pg 18 20: *rspec-knapsack-pg
|
||||
rspec-pg 19 20: *rspec-knapsack-pg
|
||||
|
||||
rspec mysql 0 20: *rspec-knapsack-mysql
|
||||
rspec mysql 1 20: *rspec-knapsack-mysql
|
||||
rspec mysql 2 20: *rspec-knapsack-mysql
|
||||
rspec mysql 3 20: *rspec-knapsack-mysql
|
||||
rspec mysql 4 20: *rspec-knapsack-mysql
|
||||
rspec mysql 5 20: *rspec-knapsack-mysql
|
||||
rspec mysql 6 20: *rspec-knapsack-mysql
|
||||
rspec mysql 7 20: *rspec-knapsack-mysql
|
||||
rspec mysql 8 20: *rspec-knapsack-mysql
|
||||
rspec mysql 9 20: *rspec-knapsack-mysql
|
||||
rspec mysql 10 20: *rspec-knapsack-mysql
|
||||
rspec mysql 11 20: *rspec-knapsack-mysql
|
||||
rspec mysql 12 20: *rspec-knapsack-mysql
|
||||
rspec mysql 13 20: *rspec-knapsack-mysql
|
||||
rspec mysql 14 20: *rspec-knapsack-mysql
|
||||
rspec mysql 15 20: *rspec-knapsack-mysql
|
||||
rspec mysql 16 20: *rspec-knapsack-mysql
|
||||
rspec mysql 17 20: *rspec-knapsack-mysql
|
||||
rspec mysql 18 20: *rspec-knapsack-mysql
|
||||
rspec mysql 19 20: *rspec-knapsack-mysql
|
||||
rspec-mysql 0 20: *rspec-knapsack-mysql
|
||||
rspec-mysql 1 20: *rspec-knapsack-mysql
|
||||
rspec-mysql 2 20: *rspec-knapsack-mysql
|
||||
rspec-mysql 3 20: *rspec-knapsack-mysql
|
||||
rspec-mysql 4 20: *rspec-knapsack-mysql
|
||||
rspec-mysql 5 20: *rspec-knapsack-mysql
|
||||
rspec-mysql 6 20: *rspec-knapsack-mysql
|
||||
rspec-mysql 7 20: *rspec-knapsack-mysql
|
||||
rspec-mysql 8 20: *rspec-knapsack-mysql
|
||||
rspec-mysql 9 20: *rspec-knapsack-mysql
|
||||
rspec-mysql 10 20: *rspec-knapsack-mysql
|
||||
rspec-mysql 11 20: *rspec-knapsack-mysql
|
||||
rspec-mysql 12 20: *rspec-knapsack-mysql
|
||||
rspec-mysql 13 20: *rspec-knapsack-mysql
|
||||
rspec-mysql 14 20: *rspec-knapsack-mysql
|
||||
rspec-mysql 15 20: *rspec-knapsack-mysql
|
||||
rspec-mysql 16 20: *rspec-knapsack-mysql
|
||||
rspec-mysql 17 20: *rspec-knapsack-mysql
|
||||
rspec-mysql 18 20: *rspec-knapsack-mysql
|
||||
rspec-mysql 19 20: *rspec-knapsack-mysql
|
||||
|
||||
spinach pg 0 10: *spinach-knapsack-pg
|
||||
spinach pg 1 10: *spinach-knapsack-pg
|
||||
spinach pg 2 10: *spinach-knapsack-pg
|
||||
spinach pg 3 10: *spinach-knapsack-pg
|
||||
spinach pg 4 10: *spinach-knapsack-pg
|
||||
spinach pg 5 10: *spinach-knapsack-pg
|
||||
spinach pg 6 10: *spinach-knapsack-pg
|
||||
spinach pg 7 10: *spinach-knapsack-pg
|
||||
spinach pg 8 10: *spinach-knapsack-pg
|
||||
spinach pg 9 10: *spinach-knapsack-pg
|
||||
spinach-pg 0 10: *spinach-knapsack-pg
|
||||
spinach-pg 1 10: *spinach-knapsack-pg
|
||||
spinach-pg 2 10: *spinach-knapsack-pg
|
||||
spinach-pg 3 10: *spinach-knapsack-pg
|
||||
spinach-pg 4 10: *spinach-knapsack-pg
|
||||
spinach-pg 5 10: *spinach-knapsack-pg
|
||||
spinach-pg 6 10: *spinach-knapsack-pg
|
||||
spinach-pg 7 10: *spinach-knapsack-pg
|
||||
spinach-pg 8 10: *spinach-knapsack-pg
|
||||
spinach-pg 9 10: *spinach-knapsack-pg
|
||||
|
||||
spinach mysql 0 10: *spinach-knapsack-mysql
|
||||
spinach mysql 1 10: *spinach-knapsack-mysql
|
||||
spinach mysql 2 10: *spinach-knapsack-mysql
|
||||
spinach mysql 3 10: *spinach-knapsack-mysql
|
||||
spinach mysql 4 10: *spinach-knapsack-mysql
|
||||
spinach mysql 5 10: *spinach-knapsack-mysql
|
||||
spinach mysql 6 10: *spinach-knapsack-mysql
|
||||
spinach mysql 7 10: *spinach-knapsack-mysql
|
||||
spinach mysql 8 10: *spinach-knapsack-mysql
|
||||
spinach mysql 9 10: *spinach-knapsack-mysql
|
||||
spinach-mysql 0 10: *spinach-knapsack-mysql
|
||||
spinach-mysql 1 10: *spinach-knapsack-mysql
|
||||
spinach-mysql 2 10: *spinach-knapsack-mysql
|
||||
spinach-mysql 3 10: *spinach-knapsack-mysql
|
||||
spinach-mysql 4 10: *spinach-knapsack-mysql
|
||||
spinach-mysql 5 10: *spinach-knapsack-mysql
|
||||
spinach-mysql 6 10: *spinach-knapsack-mysql
|
||||
spinach-mysql 7 10: *spinach-knapsack-mysql
|
||||
spinach-mysql 8 10: *spinach-knapsack-mysql
|
||||
spinach-mysql 9 10: *spinach-knapsack-mysql
|
||||
|
||||
# Other generic tests
|
||||
.ruby-static-analysis: &ruby-static-analysis
|
||||
variables:
|
||||
SIMPLECOV: "false"
|
||||
SETUP_DB: "false"
|
||||
USE_BUNDLE_INSTALL: "true"
|
||||
|
||||
.rake-exec: &rake-exec
|
||||
<<: *ruby-static-analysis
|
||||
|
@ -338,11 +337,11 @@ ee_compat_check:
|
|||
script:
|
||||
- bundle exec rake db:migrate:reset
|
||||
|
||||
db:migrate:reset pg:
|
||||
db:migrate:reset-pg:
|
||||
<<: *db-migrate-reset
|
||||
<<: *use-pg
|
||||
|
||||
db:migrate:reset mysql:
|
||||
db:migrate:reset-mysql:
|
||||
<<: *db-migrate-reset
|
||||
<<: *use-mysql
|
||||
|
||||
|
@ -354,11 +353,11 @@ db:migrate:reset mysql:
|
|||
- bundle exec rake db:rollback STEP=120
|
||||
- bundle exec rake db:migrate
|
||||
|
||||
db:rollback pg:
|
||||
db:rollback-pg:
|
||||
<<: *db-rollback
|
||||
<<: *use-pg
|
||||
|
||||
db:rollback mysql:
|
||||
db:rollback-mysql:
|
||||
<<: *db-rollback
|
||||
<<: *use-mysql
|
||||
|
||||
|
@ -380,11 +379,11 @@ db:rollback mysql:
|
|||
paths:
|
||||
- log/development.log
|
||||
|
||||
db:seed_fu pg:
|
||||
db:seed_fu-pg:
|
||||
<<: *db-seed_fu
|
||||
<<: *use-pg
|
||||
|
||||
db:seed_fu mysql:
|
||||
db:seed_fu-mysql:
|
||||
<<: *db-seed_fu
|
||||
<<: *use-mysql
|
||||
|
||||
|
@ -445,11 +444,11 @@ karma:
|
|||
- . scripts/prepare_build.sh
|
||||
- bundle exec rake db:migrate
|
||||
|
||||
migration path pg:
|
||||
migration:path-pg:
|
||||
<<: *migration-paths
|
||||
<<: *use-pg
|
||||
|
||||
migration path mysql:
|
||||
migration:path-mysql:
|
||||
<<: *migration-paths
|
||||
<<: *use-mysql
|
||||
|
||||
|
|
|
@ -4,9 +4,22 @@ export SETUP_DB=${SETUP_DB:-true}
|
|||
export USE_BUNDLE_INSTALL=${USE_BUNDLE_INSTALL:-true}
|
||||
export BUNDLE_INSTALL_FLAGS="--without production --jobs $(nproc) --path vendor --retry 3 --quiet"
|
||||
|
||||
if [ "$USE_BUNDLE_INSTALL" != "false" ]; then
|
||||
bundle install --clean $BUNDLE_INSTALL_FLAGS && bundle check
|
||||
fi
|
||||
|
||||
# Only install knapsack after bundle install! Otherwise oddly some native
|
||||
# gems could not be found under some circumstance. No idea why, hours wasted.
|
||||
retry gem install knapsack fog-aws mime-types
|
||||
|
||||
cp config/resque.yml.example config/resque.yml
|
||||
sed -i 's/localhost/redis/g' config/resque.yml
|
||||
|
||||
cp config/gitlab.yml.example config/gitlab.yml
|
||||
|
||||
# Determine the database by looking at the job name.
|
||||
# For example, we'll get pg if the job is `rspec pg 19 20`
|
||||
export GITLAB_DATABASE=$(echo $CI_JOB_NAME | cut -f2 -d' ')
|
||||
# For example, we'll get pg if the job is `rspec-pg 19 20`
|
||||
export GITLAB_DATABASE=$(echo $CI_JOB_NAME | cut -f1 -d' ' | cut -f2 -d-)
|
||||
|
||||
# This would make the default database postgresql, and we could also use
|
||||
# pg to mean postgresql.
|
||||
|
@ -24,19 +37,6 @@ else # Assume it's mysql
|
|||
sed -i 's/# host:.*/host: mysql/g' config/database.yml
|
||||
fi
|
||||
|
||||
cp config/resque.yml.example config/resque.yml
|
||||
sed -i 's/localhost/redis/g' config/resque.yml
|
||||
|
||||
cp config/gitlab.yml.example config/gitlab.yml
|
||||
|
||||
if [ "$USE_BUNDLE_INSTALL" != "false" ]; then
|
||||
bundle install --clean $BUNDLE_INSTALL_FLAGS && bundle check
|
||||
fi
|
||||
|
||||
# Only install knapsack after bundle install! Otherwise oddly some native
|
||||
# gems could not be found under some circumstance. No idea why, hours wasted.
|
||||
retry gem install knapsack fog-aws mime-types
|
||||
|
||||
if [ "$SETUP_DB" != "false" ]; then
|
||||
bundle exec rake db:drop db:create db:schema:load db:migrate
|
||||
|
||||
|
|
Loading…
Reference in New Issue