diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-12-17 10:02:15 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-12-17 10:02:15 +0000 |
| commit | 35c69ea2187af037428c3b25d735f1a359833d96 (patch) | |
| tree | c14fe530b96e71b2f69a3e13fa70bdbf181adec3 | |
| parent | c40d979605f4b7f4994a78b0247079af25fa9afe (diff) | |
| parent | a183aa3c4776121761376830d1db15caa5aa0dcc (diff) | |
| download | gitlab-ce-35c69ea2187af037428c3b25d735f1a359833d96.tar.gz | |
Merge branch 'rs-prepare-build-parity' into 'master'
CE-EE parity for prepare_build script
See merge request gitlab-org/gitlab-ce!23819
| -rw-r--r-- | scripts/prepare_build.sh | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh index 2e8fec166a3..d85c53090a4 100644 --- a/scripts/prepare_build.sh +++ b/scripts/prepare_build.sh @@ -5,7 +5,7 @@ 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 + bundle install --clean $BUNDLE_INSTALL_FLAGS && bundle check fi # Only install knapsack after bundle install! Otherwise oddly some native @@ -22,18 +22,30 @@ 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. if [ "$GITLAB_DATABASE" != 'mysql' ]; then - export GITLAB_DATABASE='postgresql' + export GITLAB_DATABASE='postgresql' fi cp config/database.yml.$GITLAB_DATABASE config/database.yml +if [ -f config/database_geo.yml.$GITLAB_DATABASE ]; then + cp config/database_geo.yml.$GITLAB_DATABASE config/database_geo.yml +fi + # Set user to a non-superuser to ensure we test permissions sed -i 's/username: root/username: gitlab/g' config/database.yml if [ "$GITLAB_DATABASE" = 'postgresql' ]; then - sed -i 's/localhost/postgres/g' config/database.yml + sed -i 's/localhost/postgres/g' config/database.yml + + if [ -f config/database_geo.yml ]; then + sed -i 's/localhost/postgres/g' config/database_geo.yml + fi else # Assume it's mysql - sed -i 's/localhost/mysql/g' config/database.yml + sed -i 's/localhost/mysql/g' config/database.yml + + if [ -f config/database_geo.yml ]; then + sed -i 's/localhost/mysql/g' config/database_geo.yml + fi fi cp config/resque.yml.example config/resque.yml @@ -49,7 +61,7 @@ cp config/redis.shared_state.yml.example config/redis.shared_state.yml sed -i 's/localhost/redis/g' config/redis.shared_state.yml if [ "$SETUP_DB" != "false" ]; then - setup_db + setup_db elif getent hosts postgres || getent hosts mysql; then - setup_db_user_only + setup_db_user_only fi |