Merge branch 'rs-prepare-build-parity' into 'master'

CE-EE parity for prepare_build script

See merge request gitlab-org/gitlab-ce!23819

scripts/prepare_build.sh

@@ -27,13 +27,25 @@ 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
+
+  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
+
+  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