Just set GITLAB_DATABASE in the script

This commit is contained in:
Lin Jen-Shin 2017-04-11 01:56:30 +08:00
parent 1b14a8d001
commit 5e6d09edba
2 changed files with 1 additions and 7 deletions

View File

@ -315,7 +315,6 @@ rake mysql db:rollback:
/home/git/repositories/gitlab-org/gitlab-test.git
- bundle exec rake db:setup db:seed_fu
variables:
GITLAB_DATABASE: $CI_JOB_NAME[1]
SIZE: "1"
SETUP_DB: "false"
RAILS_ENV: "development"
@ -435,7 +434,6 @@ bundler:audit:
- source scripts/prepare_build.sh
- bundle exec rake db:migrate
variables:
GITLAB_DATABASE: $CI_JOB_NAME[1]
SETUP_DB: "false"
migration pg paths:

View File

@ -2,12 +2,8 @@
. scripts/utils.sh
echo $CI_JOB_NAME
job_name=$(echo $CI_JOB_NAME | cut -f2 -d' ')
echo $job_name
export SETUP_DB=${SETUP_DB:-true}
export GITLAB_DATABASE=${GITLAB_DATABASE:-$job_name}
export GITLAB_DATABASE=$(echo $CI_JOB_NAME | cut -f2 -d' ')
export USE_BUNDLE_INSTALL=${USE_BUNDLE_INSTALL:-true}
if [ "$GITLAB_DATABASE" != 'mysql' ]; then