chore(ci) refactor reports from tests stage, add it to upgrade

core_dumps/upgrade_setup_cent.sh

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+source ../build/utils.sh
+
 set -xeuo pipefail
 
 VERSION="$1"
@@ -16,6 +18,9 @@ yum -y install MariaDB-server MariaDB-client MariaDB-columnstore-engine MariaDB-
 
 systemctl start mariadb
 systemctl start mariadb-columnstore
+
+INITIAL_VERSION=$(mariadb -e "select @@version;")
+
 bash -c "./upgrade_data.sh"
 bash -c "./upgrade_verify.sh"
 
@@ -33,4 +38,14 @@ EOF
 cd /
 
 yum -y update MariaDB-server MariaDB-client MariaDB-columnstore-engine MariaDB-columnstore-engine-debuginfo
-bash -c "./upgrade_verify.sh"
+UPGRADED_VERSION=$(mariadb -e "select @@version;")
+
+if [[ "$INITIAL_VERSION" == "$UPGRADED_VERSION" ]]; then
+  error "The upgrade didn't happen!"
+  exit 1
+else
+  message_splitted "The upgrade from "$INITIAL_VERSION" to "$UPGRADED_VERSION" succeded!"
+  bash -c "./upgrade_verify.sh"
+fi
+
+

core_dumps/upgrade_setup_deb.sh

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+source ../build/utils.sh
+
 set -xeuo pipefail
 
 VERSION="$1"
@@ -8,6 +10,9 @@ ARCH="$3"
 LINK="$4"
 UPGRADE_TOKEN="$5"
 
+DEBIAN_FRONTEND=noninteractive
+UCF_FORCE_CONFNEW=1
+
 apt install --yes rsyslog
 sed -i "s/exit 101/exit 0/g" /usr/sbin/policy-rc.d
 bash -c "apt update --yes && apt install -y procps wget curl"
@@ -18,6 +23,9 @@ apt update --yes
 apt install --yes mariadb-server mariadb-client mariadb-plugin-columnstore
 systemctl start mariadb
 systemctl start mariadb-columnstore
+
+INITIAL_VERSION=$(mariadb -e "select @@version;")
+
 bash -c "./upgrade_data.sh"
 bash -c "./upgrade_verify.sh"
 
@@ -28,5 +36,26 @@ EOF
 
 bash -c "./setup-repo.sh"
 
-apt upgrade --yes
-bash -c "./upgrade_verify.sh"
+
+# Configuration file '/etc/columnstore/Columnstore.xml'
+#  ==> Modified (by you or by a script) since installation.
+#  ==> Package distributor has shipped an updated version.
+#    What would you like to do about it ?  Your options are:
+#     Y or I  : install the package maintainer's version
+#     N or O  : keep your currently-installed version
+#       D     : show the differences between the versions
+#       Z     : start a shell to examine the situation
+#  The default action is to keep your current version.
+
+# rm to escape halt on interactive question
+apt-get --yes --with-new-pkgs -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" upgrade
+
+UPGRADED_VERSION=$(mariadb -e "select @@version;")
+
+if [[ "$INITIAL_VERSION" == "$UPGRADED_VERSION" ]]; then
+  error "The upgrade didn't happen!"
+  exit 1
+else
+  message_splitted "The upgrade from "$INITIAL_VERSION" to "$UPGRADED_VERSION" succeded!"
+  bash -c "./upgrade_verify.sh"
+fi

core_dumps/upgrade_setup_rpm.sh

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+source ../build/utils.sh
+
 set -xeuo pipefail
 
 VERSION="$1"
@@ -9,7 +11,7 @@ LINK="$4"
 UPGRADE_TOKEN="$5"
 
 yum clean all
-rm -rf /var/cache/dnf/*
+#rm -rf /var/cache/dnf/*
 yum install -y wget which procps-ng diffutils rsyslog
 wget https://dlm.mariadb.com/enterprise-release-helpers/mariadb_es_repo_setup -O mariadb_es_repo_setup
 chmod +x mariadb_es_repo_setup
@@ -19,6 +21,9 @@ dnf -y install MariaDB-server MariaDB-client MariaDB-columnstore-engine MariaDB-
 
 systemctl start mariadb
 systemctl start mariadb-columnstore
+
+INITIAL_VERSION=$(mariadb -e "select @@version;")
+
 bash -c "./upgrade_data.sh"
 bash -c "./upgrade_verify.sh"
 
@@ -26,4 +31,13 @@ bash -c "./setup-repo.sh"
 
 dnf repo-pkgs repo list
 dnf -y update MariaDB-server MariaDB-client MariaDB-columnstore-engine MariaDB-columnstore-engine-debuginfo
-bash -c "./upgrade_verify.sh"
+
+UPGRADED_VERSION=$(mariadb -e "select @@version;")
+
+if [[ "$INITIAL_VERSION" == "$UPGRADED_VERSION" ]]; then
+  error "The upgrade didn't happen!"
+  exit 1
+else
+  message_splitted "The upgrade from "$INITIAL_VERSION" to "$UPGRADED_VERSION" succeded!"
+  bash -c "./upgrade_verify.sh"
+fi