Skip to content

Commit d776c21

Browse files
committed
MDBF-1067: rpm upgrade to use osname/version/arch in update urls
Except for rockylinux which has out of sync rpm layout. buildarch becomes the arch property in the install/upgrade builders which in the bash_lib.sh becomes a $arch bash variable. This is appended to https://mirror.mariadb.org/yum/$mariadb_version/ and https://archive.mariadb.org/mariadb-$mariadb_version/yum/ in the bash_lib.sh script to form the urls for upgrade tests.
1 parent 54dd742 commit d776c21

1 file changed

Lines changed: 15 additions & 9 deletions

File tree

master-libvirt/master.cfg

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -247,15 +247,21 @@ for builder_name in BUILDERS_INSTALL:
247247
elif builder_type == "rpm":
248248
factory_install = f_rpm_install
249249
factory_upgrade = f_rpm_upgrade
250-
build_arch = (
251-
os_name + str(OS_INFO[os_info_name]["version_name"]) + "-" + platform
252-
)
253-
254-
# FIXME - all RPM's should follow the same conventions!
255-
if os_name == "centos" and OS_INFO[os_info_name]["version_name"] >= 9:
256-
if platform == "amd64":
257-
platform = "x86_64"
258-
build_arch = f"centos/{OS_INFO[os_info_name]['version_name']}/{platform}"
250+
if os_name.startswith("rockylinux"):
251+
# FIXME - all RPM's should follow the same conventions!
252+
build_arch = (
253+
os_name + str(OS_INFO[os_info_name]["version_name"]) + "-" + platform
254+
)
255+
else:
256+
if platform == "amd64":
257+
platform = "x86_64"
258+
build_arch = (
259+
os_name
260+
+ "/"
261+
+ str(OS_INFO[os_info_name]["version_name"])
262+
+ "/"
263+
+ platform
264+
)
259265

260266
c["builders"].append(
261267
util.BuilderConfig(

0 commit comments

Comments
 (0)