diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-04-11 01:56:30 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-04-11 01:56:30 +0800 |
| commit | 5e6d09edba4c782237544ac46edc320a27bcd98f (patch) | |
| tree | c1a46f36e26a6645392ad47cd50e53b832fce399 | |
| parent | 1b14a8d001941895d79fcbe807bef2f052b4289f (diff) | |
| download | gitlab-ce-5e6d09edba4c782237544ac46edc320a27bcd98f.tar.gz | |
Just set GITLAB_DATABASE in the script
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rwxr-xr-x | scripts/prepare_build.sh | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d08fbd58fe1..cbe7d02389a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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: diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh index 48b046116e4..81fdf753c4e 100755 --- a/scripts/prepare_build.sh +++ b/scripts/prepare_build.sh @@ -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 |