Merge branch '2800-postgresql-detection-and-upgrading-since-10-0-0-rc5-ubuntu-16-10' into 'master'

Update to pg-upgrade output

Closes #2800

See merge request !1962

(cherry picked from commit 1248e09a)

7b80458b Update to pg-upgrade output
f78a22d1 Adding Changelog entry for #2800
c84c2a75 Merge branch 'master' into '2800-postgresql-detection-and-upgrading-since-10-0-0-rc5-ubuntu-16-10'

CHANGELOG.md

@@ -6,6 +6,7 @@ omnibus-gitlab repository.
 10.0.2
 - Fix an issue where enabling a GitLab Geo role would also disable all default services
+- Update pg-upgrade output to be more clear when a bundled PostgreSQL is not in use
 10.0.1

files/gitlab-ctl-commands/pg-upgrade.rb

@@ -70,6 +70,14 @@ add_command_under_category 'pg-upgrade', 'database',
     Kernel.exit 0
   end
+  log 'Checking for a newer version of PostgreSQL to install'
+  if upgrade_version && Dir.exist?("#{INST_DIR}/#{upgrade_version}")
+    log "Upgrading PostgreSQL to #{upgrade_version}"
+  else
+    $stderr.puts 'No new version of PostgreSQL installed, nothing to upgrade to'
+    Kernel.exit 0
+  end
+
   if progress_message('Checking if we already upgraded') do
     running_version == upgrade_version
   end
@@ -77,16 +85,6 @@ add_command_under_category 'pg-upgrade', 'database',
     Kernel.exit 0
   end
-  if progress_message(
-    'Checking for a newer version of PostgreSQL to install') do
-      upgrade_version && Dir.exist?("#{INST_DIR}/#{upgrade_version}")
-    end
-    log "Upgrading PostgreSQL to #{upgrade_version}"
-  else
-    $stderr.puts 'No new version of PostgreSQL installed, nothing to upgrade to'
-    Kernel.exit 0
-  end
-
   unless progress_message(
     'Checking if PostgreSQL bin files are symlinked to the expected location'
   ) do