Skip to content

Commit b44298f

Browse files
grooverdanRazvanLiviuVarzaru
authored andcommitted
Run columnstore upgrade on specified architectures only
This prevents a no-op on ppc64le
1 parent 7a46dc2 commit b44298f

3 files changed

Lines changed: 4 additions & 13 deletions

File tree

constants.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -303,12 +303,13 @@
303303
if arch not in ["s390x", "x86"]:
304304
BUILDERS_INSTALL.append(builder_name_autobake + "-install")
305305
BUILDERS_UPGRADE.append(builder_name_autobake + "-minor-upgrade-all")
306-
BUILDERS_UPGRADE.append(
307-
builder_name_autobake + "-minor-upgrade-columnstore"
308-
)
309306
BUILDERS_UPGRADE.append(builder_name_autobake + "-major-upgrade")
310307
BUILDERS_UPGRADE.append(builder_name_autobake + "-distro-upgrade")
311308

309+
if arch in ["amd64", "aarch64"]:
310+
BUILDERS_UPGRADE.append(
311+
builder_name_autobake + "-minor-upgrade-columnstore"
312+
)
312313
BUILDERS_GALERA = list(
313314
map(lambda x: "gal-" + "-".join(x.split("-")[:3]), BUILDERS_AUTOBAKE)
314315
)

scripts/deb-upgrade.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,6 @@ case $test_mode in
7979
package_list=mariadb-server
8080
;;
8181
columnstore)
82-
get_packages_file_mirror
83-
if ! grep columnstore Packages >/dev/null; then
84-
bb_log_warn "Columnstore was not found in packages, the test will not be run"
85-
exit
86-
fi
8782
package_list="mariadb-server mariadb-plugin-columnstore"
8883
;;
8984
*)

scripts/rpm-upgrade.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,6 @@ case $test_mode in
5757
fi
5858
;;
5959
columnstore)
60-
package_list=$(rpm_repoquery)
61-
if ! echo "$package_list" | grep -q columnstore-engine; then
62-
bb_log_warn "Columnstore was not found in the released packages, the test will not be run"
63-
exit
64-
fi
6560
package_list="MariaDB-server MariaDB-columnstore-engine"
6661
alternative_names_package_list=$package_list
6762
;;

0 commit comments

Comments
 (0)