MDBF-1104 Auto-determine version name of distro upgrade tests

dist_name, version_name and arch can now be determined by
install/upgrade scripts.

By using the /etc/os-version defines consistent across RPM
based distros we can obtain the path of install/upgrade tests
based on $ID, the distro and $VERSION_ID, the release version
8, 9, 10 for RHEL and derivities/clones, and 44 for Fedora.

Debian/Ubuntu no-longer need version_name as /etc/os-release
provides VERSION_CODENAME and $(arch), the command rather
than env variable, is the architecture.

Author: grooverdan

master-libvirt/master.cfg

@@ -43,10 +43,8 @@ def getRpmUpgradeStep():
         env=envFromProperties(
             [
                 "BB_CI",
-                "arch",
                 "artifactsURL",
                 "branch",
-                "dist_name",
                 "is_main_tree",
                 "major_version",
                 "mariadb_version",
@@ -56,7 +54,6 @@ def getRpmUpgradeStep():
                 "systemdCapability",
                 "test_mode",
                 "test_type",
-                "version_name",
             ]
         ),
         command=["./rpm-upgrade.sh"],
@@ -72,10 +69,8 @@ def getRpmInstallStep():
         env=envFromProperties(
             [
                 "BB_CI",
-                "arch",
                 "artifactsURL",
                 "branch",
-                "dist_name",
                 "major_version",
                 "mariadb_version",
                 "master_branch",
@@ -84,7 +79,6 @@ def getRpmInstallStep():
                 "systemdCapability",
                 "test_mode",
                 "test_type",
-                "version_name",
             ]
         ),
         command=["./rpm-install.sh"],
@@ -100,10 +94,8 @@ def getDebUpgradeStep():
         env=envFromProperties(
             [
                 "BB_CI",
-                "arch",
                 "artifactsURL",
                 "branch",
-                "dist_name",
                 "major_version",
                 "mariadb_version",
                 "master_branch",
@@ -112,7 +104,6 @@ def getDebUpgradeStep():
                 "systemdCapability",
                 "test_mode",
                 "test_type",
-                "version_name",
             ]
         ),
         command=["./deb-upgrade.sh"],
@@ -128,10 +119,8 @@ def getDebInstallStep():
         env=envFromProperties(
             [
                 "BB_CI",
-                "arch",
                 "artifactsURL",
                 "branch",
-                "dist_name",
                 "major_version",
                 "mariadb_version",
                 "master_branch",
@@ -140,7 +129,6 @@ def getDebInstallStep():
                 "systemdCapability",
                 "test_mode",
                 "test_type",
-                "version_name",
             ]
         ),
         command=["./deb-install.sh"],
@@ -243,19 +231,9 @@ for builder_name in BUILDERS_INSTALL:
     if builder_type == "deb":
         factory_install = f_deb_install
         factory_upgrade = f_deb_upgrade
-        build_arch = platform
     elif builder_type == "rpm":
         factory_install = f_rpm_install
         factory_upgrade = f_rpm_upgrade
-        build_arch = (
-            os_name + str(OS_INFO[os_info_name]["version_name"]) + "-" + platform
-        )
-
-    # FIXME - all RPM's should follow the same conventions!
-    if os_name == "centos" and OS_INFO[os_info_name]["version_name"] >= 9:
-        if platform == "amd64":
-            platform = "x86_64"
-        build_arch = f"centos/{OS_INFO[os_info_name]['version_name']}/{platform}"
 
     c["builders"].append(
         util.BuilderConfig(
@@ -268,9 +246,6 @@ for builder_name in BUILDERS_INSTALL:
             properties={
                 "systemdCapability": "yes",
                 "needsGalera": "yes",
-                "dist_name": os_name,
-                "version_name": OS_INFO[os_info_name]["version_name"],
-                "arch": build_arch,
                 "BB_CI": True,
                 "artifactsURL": artifactsURL,
             },
@@ -292,9 +267,6 @@ for builder_name in BUILDERS_INSTALL:
             properties={
                 "systemdCapability": "yes",
                 "needsGalera": "yes",
-                "dist_name": os_name,
-                "version_name": OS_INFO[os_info_name]["version_name"],
-                "arch": build_arch,
                 "test_mode": "server",
                 "test_type": "major",
                 "BB_CI": True,
@@ -318,9 +290,6 @@ for builder_name in BUILDERS_INSTALL:
             properties={
                 "systemdCapability": "yes",
                 "needsGalera": "yes",
-                "dist_name": os_name,
-                "version_name": OS_INFO[os_info_name]["version_name"],
-                "arch": build_arch,
                 "test_mode": "all",
                 "test_type": "minor",
                 "BB_CI": True,
@@ -342,9 +311,6 @@ for builder_name in BUILDERS_INSTALL:
             properties={
                 "systemdCapability": "yes",
                 "needsGalera": "no",
-                "dist_name": os_name,
-                "version_name": OS_INFO[os_info_name]["version_name"],
-                "arch": build_arch,
                 "test_mode": "columnstore",
                 "test_type": "minor",
                 "BB_CI": True,

os_info.yaml

@@ -1,7 +1,6 @@
 ---
 almalinux-8:
   image_tag: almalinux8
-  version_name: 8
   tags:
     - release_packages
   arch:
@@ -12,7 +11,6 @@ almalinux-8:
   install_only: True
 almalinux-9:
   image_tag: almalinux9
-  version_name: 9
   tags:
     - release_packages
   arch:
@@ -23,7 +21,6 @@ almalinux-9:
   install_only: True
 almalinux-10:
   image_tag: almalinux10
-  version_name: 10
   tags:
     - release_packages
   arch:
@@ -34,7 +31,6 @@ almalinux-10:
   install_only: True
 centos-stream9:
   image_tag: centosstream9
-  version_name: 9
   tags:
     - release_packages
   arch:
@@ -44,7 +40,6 @@ centos-stream9:
   type: rpm
 centos-stream10:
   image_tag: centosstream10
-  version_name: 10
   tags:
     - release_packages
     - bleeding-edge
@@ -55,7 +50,6 @@ centos-stream10:
   type: rpm
 debian-11:
   image_tag: debian11
-  version_name: bullseye
   tags:
     - release_packages
   arch:
@@ -64,7 +58,6 @@ debian-11:
   type: deb
 debian-12:
   image_tag: debian12
-  version_name: bookworm
   tags:
     - release_packages
   arch:
@@ -75,7 +68,6 @@ debian-12:
   type: deb
 debian-13:
   image_tag: debian13
-  version_name: trixie
   tags:
     - release_packages
   arch:
@@ -86,7 +78,6 @@ debian-13:
   type: deb
 debian-sid:
   image_tag: debiansid
-  version_name: sid
   tags:
     - release_packages
     - bleeding-edge
@@ -100,7 +91,6 @@ fedora-41:
   image_tag: fedora41
   tags:
     - release_packages
-  version_name: 41
   arch:
     - amd64
     - aarch64
@@ -118,7 +108,6 @@ openeuler-2403:
   image_tag: openeuler2403
   tags:
     - release_packages
-  version_name: 24.03
   arch:
     - amd64
     - aarch64
@@ -127,23 +116,20 @@ opensuse-1506:
   image_tag: opensuse1506
   tags:
     - release_packages
-  version_name: 156
   arch:
     - amd64
   type: rpm
 rhel-7:
   image_tag: rhel7
   tags:
     - release_packages
-  version_name: 7
   arch:
     - amd64
   type: rpm
 rhel-8:
   image_tag: rhel8
   tags:
     - release_packages
-  version_name: 8
   arch:
     - amd64
     - aarch64
@@ -154,7 +140,6 @@ rhel-9:
   image_tag: rhel9
   tags:
     - release_packages
-  version_name: 9
   arch:
     - amd64
     - aarch64
@@ -165,7 +150,6 @@ rhel-10:
   image_tag: rhel10
   tags:
     - release_packages
-  version_name: 10
   arch:
     - amd64
     - aarch64
@@ -175,7 +159,6 @@ rhel-10:
 rockylinux-8:
   image_tag: rockylinux8
   tags: []
-  version_name: 8
   arch:
     - amd64
     - aarch64
@@ -184,7 +167,6 @@ rockylinux-8:
 rockylinux-9:
   image_tag: rockylinux9
   tags: []
-  version_name: 9
   arch:
     - amd64
     - aarch64
@@ -194,7 +176,6 @@ rockylinux-9:
 rockylinux-10:
   image_tag: rockylinux10
   tags: []
-  version_name: 10
   arch:
     - amd64
     - aarch64
@@ -205,7 +186,6 @@ sles-1506:
   image_tag: sles1506
   tags:
     - release_packages
-  version_name: 15
   arch:
     - amd64
     - s390x
@@ -214,7 +194,6 @@ sles-1507:
   image_tag: sles1507
   tags:
     - release_packages
-  version_name: 157
   arch:
     - amd64
     - s390x
@@ -223,7 +202,6 @@ ubuntu-2204:
   image_tag: ubuntu22.04
   tags:
     - release_packages
-  version_name: jammy
   arch:
     - amd64
     - aarch64
@@ -234,7 +212,6 @@ ubuntu-2404:
   image_tag: ubuntu24.04
   tags:
     - release_packages
-  version_name: noble
   arch:
     - amd64
     - aarch64
@@ -245,7 +222,6 @@ ubuntu-2410:
   image_tag: ubuntu24.10
   tags:
     - release_packages
-  version_name: oracular
   arch:
     - amd64
     - aarch64
@@ -254,7 +230,6 @@ ubuntu-2504:
   image_tag: ubuntu25.04
   tags:
     - release_packages
-  version_name: plucky
   arch:
     - amd64
     - aarch64

scripts/bash_lib.sh

@@ -85,7 +85,7 @@ bb_print_env() {
   # Environment
   source /etc/os-release
   echo -e "\nDistribution: $PRETTY_NAME"
-  echo "Architecture: $arch"
+  echo "Architecture: $(uname -m)"
   echo -e "Systemd capability: $systemdCapability"
   echo "MariaDB version: ${mariadb_version/mariadb-/}"
   if [[ $test_type == "major" ]]; then
@@ -250,21 +250,23 @@ deb_setup_mariadb_mirror() {
     exit 1
   }
   #//TEMP it's probably better to install the last stable release here...?
+  source /etc/os-release
+
   mirror_url="https://deb.mariadb.org/$branch"
   archive_url="https://archive.mariadb.org/mariadb-$branch/repo"
-  if wget -q --method=HEAD "$mirror_url/$dist_name/dists/$version_name"; then
+  if wget -q --method=HEAD "$mirror_url/$ID/dists/$VERSION_CODENAME"; then
     baseurl="$mirror_url"
-  elif wget -q --method=HEAD "$archive_url/$dist_name/dists/$version_name"; then
+  elif wget -q --method=HEAD "$archive_url/$ID/dists/$VERSION_CODENAME"; then
     baseurl="$archive_url"
   else
     # the correct way of handling this would be to not even start the check
     # since we know it will always fail. But apparently, it's not going to
     # happen soon in BB. Once done though, replace the warning with an error
     # and use a non-zero exit code.
-    bb_log_warn "deb_setup_mariadb_mirror: $branch packages for $dist_name $version_name does not exist on deb|archive.mariadb.org"
+    bb_log_warn "deb_setup_mariadb_mirror: $branch packages for $ID $VERSION_CODENAME does not exist on deb|archive.mariadb.org"
     exit 0
   fi
-  sudo sh -c "echo 'deb $baseurl/$dist_name $version_name main' >/etc/apt/sources.list.d/mariadb.list"
+  sudo sh -c "echo 'deb $baseurl/$ID $VERSION_CODENAME main' >/etc/apt/sources.list.d/mariadb.list"
   sudo wget https://mariadb.org/mariadb_release_signing_key.asc -O /etc/apt/trusted.gpg.d/mariadb_release_signing_key.asc || {
     bb_log_err "mariadb repository key installation failed"
     exit 1
@@ -285,9 +287,11 @@ rpm_setup_mariadb_mirror() {
     bb_log_err "wget command not found"
     exit 1
   }
+  source /etc/os-release
   #//TEMP it's probably better to install the last stable release here...?
-  mirror_url="https://rpm.mariadb.org/$branch/$arch"
-  archive_url="https://archive.mariadb.org/mariadb-$branch/yum/$arch"
+  url_path="$ID/$VERSION_ID/$(rpm --eval '%_arch')"
+  mirror_url="https://rpm.mariadb.org/$branch/$url_path"
+  archive_url="https://archive.mariadb.org/mariadb-$branch/yum/$url_path"
   if wget -q --method=HEAD "$mirror_url"; then
     baseurl="$mirror_url"
   elif wget -q --method=HEAD "$archive_url"; then
@@ -297,7 +301,7 @@ rpm_setup_mariadb_mirror() {
     # since we know it will always fail. But apparently, it's not going to
     # happen soon in BB. Once done though, replace the warning with an error
     # and use a non-zero exit code.
-    bb_log_warn "rpm_setup_mariadb_mirror: $branch packages for $dist_name $version_name does not exist on https://rpm.mariadb.org/"
+    bb_log_warn "rpm_setup_mariadb_mirror: $branch packages for $ID $VERSION_ID does not exist on https://rpm.mariadb.org/"
     exit 0
   fi
   cat <<EOF | sudo tee "$(rpm_repo_dir)/MariaDB.repo"