Skip to content

Commit 18b8ca6

Browse files
committed
MDEV-9584: RPM upgrade remove hackery for testing
1 parent caa883a commit 18b8ca6

1 file changed

Lines changed: 0 additions & 20 deletions

File tree

scripts/rpm-upgrade.sh

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -138,26 +138,6 @@ if [[ $package_version == "$old_version" ]]; then
138138
exit
139139
fi
140140

141-
# ------------------------------------------------------------------------------
142-
# -- MDBF-1121 / MDEV-33459 --
143-
# ------------------------------------------------------------------------------
144-
145-
# Major upgrades within the same family (>10) and vendor (!=distro)
146-
# should work without removing old packages first.
147-
148-
old_family=$(echo "$prev_major_version" | sed -n -e 's,^\([1-9][0-9]*\)\..*$,\1,p')
149-
new_family=$(echo "$major_version" | sed -n -e 's,^\([1-9][0-9]*\)\..*$,\1,p')
150-
151-
if [[ "$test_type" == "distro" ||
152-
( "$old_family" -lt 11 && "$test_type" != "minor" ) ||
153-
"$old_family" -ne "$new_family" ]]; then
154-
bb_log_info "remove old packages for major upgrade"
155-
packages_to_remove=$(rpm -qa | grep -E '^(MariaDB|mariadb)-' | awk -F'-' '{print $1"-"$2}')
156-
echo "$packages_to_remove" | xargs sudo "$pkg_cmd" "$pkg_cmd_options" remove
157-
rpm -qa | grep -iE 'maria|mysql' || true
158-
fi
159-
# ------------------------------------------------------------------------------
160-
161141
rpm_setup_bb_galera_artifacts_mirror
162142
rpm_setup_bb_artifacts_mirror
163143
if [[ "$test_type" =~ ^(major|distro)$ ]]; then

0 commit comments

Comments
 (0)