MDBF-1103 rpm upgrade from distro default

Introduced `alternative_names_package_list`
as a method to define how are the
client and server packages called in different distro repos.

The same steps are followed as in a major upgrade i.e.:
- install previous (distro) packages
- create data structures
- remove the packages
- install current packages
- verify the data structures
- verify engines old/new - see workaround

Author: RazvanLiviuVarzaru

constants.py

@@ -297,8 +297,7 @@
                 builder_name_autobake + "-minor-upgrade-columnstore"
             )
             BUILDERS_UPGRADE.append(builder_name_autobake + "-major-upgrade")
-            if "deb" in OS_INFO[os_i]["type"]:
-                BUILDERS_UPGRADE.append(builder_name_autobake + "-distro-upgrade")
+            BUILDERS_UPGRADE.append(builder_name_autobake + "-distro-upgrade")
 
 BUILDERS_GALERA = list(
     map(lambda x: "gal-" + "-".join(x.split("-")[:3]), BUILDERS_AUTOBAKE)

scripts/bash_lib.sh

@@ -292,6 +292,11 @@ rpm_setup_mariadb_mirror() {
     bb_log_err "missing the branch variable"
     exit 1
   }
+  [[ $1 == "N/A" ]] && {
+    bb_log_info "performing a distribution upgrade, skipping repository setup"
+    set +u
+    return 0
+  }
   branch=$1
   bb_log_info "setup MariaDB repository for $branch branch"
   command -v wget >/dev/null || {
@@ -616,6 +621,14 @@ check_upgraded_versions() {
 
   res=0
   errors=""
+# MDBF-1103 - "federated", "archive", and "blackhole" engines are STATIC
+# in distro packages because they were configured with -DFEATURE_SET="community"
+# while our builds load them as DYNAMIC.
+  if [[ $test_type == "distro" ]]; then
+    for eng in FEDERATED ARCHIVE BLACKHOLE; do
+      sed -i "/${eng}/d" ./engines.old
+    done
+  fi
   engines_disappeared_or_changed=$(comm -23 ./engines.old ./engines.new | wc -l)
   set +x
   if ((engines_disappeared_or_changed != 0)); then

scripts/rpm-upgrade.sh

@@ -42,10 +42,19 @@ case $test_mode in
     package_list=$(rpm_repoquery) ||
       bb_log_err "unable to retrieve package list from repository"
     package_list=$(echo "$package_list" | grep -viE 'galera|columnstore')
+    alternative_names_package_list=$package_list
     bb_log_warn "Due to MCOL-4120 and other issues, Columnstore upgrade will be tested separately"
     ;;
   server)
     package_list="MariaDB-server MariaDB-client"
+    alternative_names_package_list=$package_list
+    if [[ "$test_type" == "distro" ]]; then
+      if [[ "$ID_LIKE" =~ ^suse.* ]]; then
+        alternative_names_package_list="mariadb mariadb-client"
+      else
+        alternative_names_package_list="mariadb-server mariadb"
+      fi
+    fi
     ;;
   columnstore)
     package_list=$(rpm_repoquery)
@@ -54,6 +63,7 @@ case $test_mode in
       exit
     fi
     package_list="MariaDB-server MariaDB-columnstore-engine"
+    alternative_names_package_list=$package_list
     ;;
   *)
     bb_log_err "unknown test mode ($test_mode)"
@@ -63,61 +73,6 @@ esac
 
 bb_log_info "Package_list: $package_list"
 
-# # //TEMP this needs to be implemented once we have SLES VM in new BB
-# # Prepare yum/zypper configuration for installation of the last release
-# if which zypper; then
-#   repo_location=/etc/zypp/repos.d
-#   install_command="zypper --no-gpg-checks install --from mariadb -y"
-#   cleanup_command="zypper clean --all"
-#   remove_command="zypper remove -y"
-#   # Since there is no reasonable "upgrade" command in zypper which would
-#   # pick up RPM files needed to upgrade existing packages, we have to use "install".
-#   # However, if we run "install *.rpm", it will install all packages, regardless
-#   # the test mode, and we will get a lot of differences in contents after upgrade
-#   # (more plugins, etc.). So, instead for each package that we are going to install,
-#   # we'll also find an RPM file which provides it, and will use its name in
-#   # in the "upgrade" (second install) command
-#   if [[ $test_mode == "all" ]]; then
-#     rm -f rpms/*columnstore*.rpm
-#     rpms_for_upgrade="rpms/*.rpm"
-#   else
-#     rpms_for_upgrade=""
-#     for p in $package_list; do
-#       for f in rpms/*.rpm; do
-#         if rpm -qp "$f" --provides | grep -i "^$p ="; then
-#           rpms_for_upgrade="$rpms_for_upgrade $f"
-#           break
-#         fi
-#       done
-#     done
-#   fi
-#   upgrade_command="zypper --no-gpg-checks install -y $rpms_for_upgrade"
-
-# As of now (February 2018), RPM packages do not support major upgrade.
-# To imitate it, we will remove previous packages and install new ones.
-# //TEMP is this still true??
-#else
-#
-# repo_location=/etc/yum.repos.d
-# install_command="sudo $pkg_cmd -y --nogpgcheck install"
-# cleanup_command="sudo $pkg_cmd clean all"
-# upgrade_command="sudo $pkg_cmd -y --nogpgcheck upgrade"
-# if [[ $test_type == "major" ]]; then
-#   upgrade_command="sudo $pkg_cmd -y --nogpgcheck install"
-# fi
-# # //TEMP not sure about the reason of this
-# # if $pkg_cmd autoremove 2>&1 | grep -q 'need to be root'; then
-# #   remove_command="sudo $pkg_cmd -y autoremove"
-# # else
-# #   remove_command="sudo $pkg_cmd -y remove"
-# # fi
-# remove_command="sudo $pkg_cmd -y autoremove"
-
-# Workaround for TODO-1479 (errors upon reading from SUSE repos):
-# sudo rm -rf
-# /etc/zypp/repos.d/SUSE_Linux_Enterprise_Server_12_SP3_x86_64:SLES12-SP3-Updates.repo
-# /etc/zypp/repos.d/SUSE_Linux_Enterprise_Server_12_SP3_x86_64:SLES12-SP3-Pool.repo
-
 # ID_LIKE may not exist
 set +u
 if [[ $ID_LIKE =~ ^suse* ]]; then
@@ -132,7 +87,7 @@ fi
 set -u
 
 # Install previous release
-echo "$package_list" | xargs sudo "$pkg_cmd" "$pkg_cmd_options" install ||
+echo "$alternative_names_package_list" | xargs sudo "$pkg_cmd" "$pkg_cmd_options" install ||
   bb_log_err "installation of a previous release failed, see the output above"
 #fi
 
@@ -184,16 +139,16 @@ if [[ $package_version == "$old_version" ]]; then
 fi
 
 # //TEMP upgrade does not work without this but why? Can't we fix it?
-if [[ $test_type == "major" ]]; then
+if [[ "$test_type" =~ ^(major|distro)$ ]]; then
   bb_log_info "remove old packages for major upgrade"
-  packages_to_remove=$(rpm -qa | grep 'MariaDB-' | awk -F'-' '{print $1"-"$2}')
+  packages_to_remove=$(rpm -qa | grep -E '^(MariaDB|mariadb)-' | awk -F'-' '{print $1"-"$2}')
   echo "$packages_to_remove" | xargs sudo "$pkg_cmd" "$pkg_cmd_options" remove
   rpm -qa | grep -iE 'maria|mysql' || true
 fi
 
 rpm_setup_bb_galera_artifacts_mirror
 rpm_setup_bb_artifacts_mirror
-if [[ $test_type == "major" ]]; then
+if [[ "$test_type" =~ ^(major|distro)$ ]]; then
   # major upgrade (remove then install)
   echo "$package_list" | xargs sudo "$pkg_cmd" "$pkg_cmd_options" install
 else
@@ -220,7 +175,7 @@ fi
 
 # Optionally (re)start the server
 set -e
-if [[ $test_type == "major" ]] || [[ $test_mode == "columnstore" ]]; then
+if [[ "$test_type" =~ ^(major|distro)$ ]] || [[ $test_mode == "columnstore" ]]; then
   control_mariadb_server restart
 fi
 
@@ -232,7 +187,7 @@ fi
 
 # Run mariadb-upgrade for non-GA branches (minor upgrades in GA branches
 # shouldn't need it)
-if [[ $major_version == "$development_branch" ]] || [[ $test_type == "major" ]]; then
+if [[ $major_version == "$development_branch" ]] || [[ "$test_type" =~ ^(major|distro)$ ]]; then
   sudo mariadb-upgrade
 fi