{deb/rpm}-upgrade: simplify install/upgrade test operations

replace pattern:

  # comment about what we are doing that isn't in bb log
  if something_might_go_wrong; then
     log_err - it went wrong
     (missing error capture)
  exit 1

to:

   bb_log_info "where testing this"
   sometime_might_go_wrong

The something_might_go_wrong in the second step will trap
and have all the saving of the failure afterwards leaving
the user with the info of what was being tested to provide
the failure context.

Author: grooverdan

scripts/deb-upgrade.sh

@@ -110,20 +110,16 @@ apt_get_update
 # We will wait till they finish, to avoid any clashes with SQL we are going to execute
 wait_for_mariadb_upgrade
 
-if ! sudo sh -c "DEBIAN_FRONTEND=noninteractive MYSQLD_STARTUP_TIMEOUT=180 \
-  apt-get -o Dpkg::Options::=--force-confnew install --allow-unauthenticated -y $package_list"; then
-  bb_log_err "Installation of a previous release failed, see the output above"
-  exit 1
-fi
+bb_log_info "Install previous version"
+sudo sh -c "DEBIAN_FRONTEND=noninteractive MYSQLD_STARTUP_TIMEOUT=180 \
+  apt-get -o Dpkg::Options::=--force-confnew install --allow-unauthenticated -y $package_list"
 
 wait_for_mariadb_upgrade
 
 if [[ -n $spider_package_list ]]; then
-  if ! sudo sh -c "DEBIAN_FRONTEND=noninteractive MYSQLD_STARTUP_TIMEOUT=180 \
-    apt-get -o Dpkg::Options::=--force-confnew install --allow-unauthenticated -y $spider_package_list"; then
-    bb_log_err "Installation of Spider from the previous release failed, see the output above"
-    exit 1
-  fi
+  bb_log_info "Install spider packages"
+  sudo sh -c "DEBIAN_FRONTEND=noninteractive MYSQLD_STARTUP_TIMEOUT=180 \
+    apt-get -o Dpkg::Options::=--force-confnew install --allow-unauthenticated -y $spider_package_list"
   wait_for_mariadb_upgrade
 fi
 
@@ -163,20 +159,17 @@ apt_get_update
 # now we upgrade, this is what we should save
 trap save_failure_logs ERR
 set -e
-# Install the new packages
-if ! sudo sh -c "DEBIAN_FRONTEND=noninteractive MYSQLD_STARTUP_TIMEOUT=180 \
-  apt-get -o Dpkg::Options::=--force-confnew install --allow-unauthenticated -y $package_list"; then
-  bb_log_err "installation of the new packages failed, see the output above"
-  exit 1
-fi
+
+bb_log_info "Install new packages"
+sudo sh -c "DEBIAN_FRONTEND=noninteractive MYSQLD_STARTUP_TIMEOUT=180 \
+  apt-get -o Dpkg::Options::=--force-confnew install --allow-unauthenticated -y $package_list"
+
 wait_for_mariadb_upgrade
 
 if [[ -n $spider_package_list ]]; then
-  if ! sudo sh -c "DEBIAN_FRONTEND=noninteractive MYSQLD_STARTUP_TIMEOUT=180 \
-    apt-get -o Dpkg::Options::=--force-confnew install --allow-unauthenticated -y $spider_package_list"; then
-    bb_log_err "Installation of the new Spider packages failed, see the output above"
-    exit 1
-  fi
+  bb_log_info "Install spider packages $spider_package_list"
+  sudo sh -c "DEBIAN_FRONTEND=noninteractive MYSQLD_STARTUP_TIMEOUT=180 \
+    apt-get -o Dpkg::Options::=--force-confnew install --allow-unauthenticated -y $spider_package_list"
   wait_for_mariadb_upgrade
 fi
 if [[ $test_mode == "columnstore" ]]; then

scripts/rpm-upgrade.sh

@@ -231,11 +231,8 @@ if [[ $test_type == "major" ]] || [[ $test_mode == "columnstore" ]]; then
   control_mariadb_server restart
 fi
 
-# Make sure that the new server is running
-if sudo mariadb -e "select @@version" | grep "$old_version"; then
-  bb_log_err "the server was not upgraded or was not restarted after upgrade"
-  exit 1
-fi
+bb_log_info "Make sure that the new server is running"
+sudo mariadb -e "select @@version" | grep "$old_version"
 
 # Run mariadb-upgrade for non-GA branches (minor upgrades in GA branches
 # shouldn't need it)