Commit 5e6d09ed authored by Lin Jen-Shin's avatar Lin Jen-Shin

Just set GITLAB_DATABASE in the script

parent 1b14a8d0
...@@ -315,7 +315,6 @@ rake mysql db:rollback: ...@@ -315,7 +315,6 @@ rake mysql db:rollback:
/home/git/repositories/gitlab-org/gitlab-test.git /home/git/repositories/gitlab-org/gitlab-test.git
- bundle exec rake db:setup db:seed_fu - bundle exec rake db:setup db:seed_fu
variables: variables:
GITLAB_DATABASE: $CI_JOB_NAME[1]
SIZE: "1" SIZE: "1"
SETUP_DB: "false" SETUP_DB: "false"
RAILS_ENV: "development" RAILS_ENV: "development"
...@@ -435,7 +434,6 @@ bundler:audit: ...@@ -435,7 +434,6 @@ bundler:audit:
- source scripts/prepare_build.sh - source scripts/prepare_build.sh
- bundle exec rake db:migrate - bundle exec rake db:migrate
variables: variables:
GITLAB_DATABASE: $CI_JOB_NAME[1]
SETUP_DB: "false" SETUP_DB: "false"
migration pg paths: migration pg paths:
......
...@@ -2,12 +2,8 @@ ...@@ -2,12 +2,8 @@
. scripts/utils.sh . 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 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} export USE_BUNDLE_INSTALL=${USE_BUNDLE_INSTALL:-true}
if [ "$GITLAB_DATABASE" != 'mysql' ]; then if [ "$GITLAB_DATABASE" != 'mysql' ]; then
......
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