diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2018-05-11 23:06:08 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2018-05-16 21:52:08 +0800 |
| commit | cdcde75bb782951b27ab9db0d54a71db7c94d7cb (patch) | |
| tree | 014c894a52bc263e485700bb1ba129db5c2dc8dc | |
| parent | 73289a8361aa6bb2cbd26873ccabe512fca6589b (diff) | |
| download | gitlab-ce-cdcde75bb782951b27ab9db0d54a71db7c94d7cb.tar.gz | |
Only setup db in the first checkout!
| -rw-r--r-- | .gitlab-ci.yml | 3 | ||||
| -rw-r--r-- | scripts/prepare_build.sh | 6 | ||||
| -rw-r--r-- | scripts/utils.sh | 8 |
3 files changed, 11 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b1445feee58..690e26711be 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -234,6 +234,7 @@ stages: <<: *dedicated-no-docs-and-no-qa-pull-cache-job variables: CREATE_DB_USER: "true" + SETUP_DB: "false" script: - git fetch https://gitlab.com/gitlab-org/gitlab-ce.git v9.3.0 - git checkout -f FETCH_HEAD @@ -242,7 +243,7 @@ stages: - cp config/gitlab.yml.example config/gitlab.yml - bundle exec rake db:drop db:create db:schema:load db:seed_fu - date - - git checkout $CI_COMMIT_SHA + - git checkout -f $CI_COMMIT_SHA - bundle install $BUNDLE_INSTALL_FLAGS - date - . scripts/prepare_build.sh diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh index 206d62dbc78..01cb01ed812 100644 --- a/scripts/prepare_build.sh +++ b/scripts/prepare_build.sh @@ -60,9 +60,5 @@ if [ "$CREATE_DB_USER" != "false" ]; then fi if [ "$SETUP_DB" != "false" ]; then - bundle exec rake db:drop db:create db:schema:load db:migrate - - if [ "$GITLAB_DATABASE" = "mysql" ]; then - bundle exec rake add_limits_mysql - fi + setup_db fi diff --git a/scripts/utils.sh b/scripts/utils.sh index 6faa701f0ce..08c33f3f67e 100644 --- a/scripts/utils.sh +++ b/scripts/utils.sh @@ -12,3 +12,11 @@ retry() { done return 1 } + +setup_db() { + bundle exec rake db:drop db:create db:schema:load db:migrate + + if [ "$GITLAB_DATABASE" = "mysql" ]; then + bundle exec rake add_limits_mysql + fi +} |