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

[EE] CE-EE parity for prepare_build script

See merge request gitlab-org/gitlab-ee!8846

scripts/prepare_build.sh

@@ -27,8 +27,9 @@ fi
 
 cp config/database.yml.$GITLAB_DATABASE config/database.yml
 
-# EE-only
-cp config/database_geo.yml.$GITLAB_DATABASE config/database_geo.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
@@ -36,13 +37,15 @@ 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
 
-    # EE-only
+  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
 
-    # EE-only
+  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