draft: debian/ubuntu /etc/os-release provides VERSION_CODENAME

removing need for version_name

Author: grooverdan

master-libvirt/master.cfg

@@ -56,7 +56,6 @@ def getRpmUpgradeStep():
                 "systemdCapability",
                 "test_mode",
                 "test_type",
-                "version_name",
             ]
         ),
         command=["./rpm-upgrade.sh"],
@@ -84,7 +83,6 @@ def getRpmInstallStep():
                 "systemdCapability",
                 "test_mode",
                 "test_type",
-                "version_name",
             ]
         ),
         command=["./rpm-install.sh"],
@@ -112,7 +110,6 @@ def getDebUpgradeStep():
                 "systemdCapability",
                 "test_mode",
                 "test_type",
-                "version_name",
             ]
         ),
         command=["./deb-upgrade.sh"],
@@ -140,7 +137,6 @@ def getDebInstallStep():
                 "systemdCapability",
                 "test_mode",
                 "test_type",
-                "version_name",
             ]
         ),
         command=["./deb-install.sh"],
@@ -261,7 +257,6 @@ for builder_name in BUILDERS_INSTALL:
                 "systemdCapability": "yes",
                 "needsGalera": "yes",
                 "dist_name": os_name,
-                "version_name": OS_INFO[os_info_name]["version_name"],
                 "arch": platform,
                 "BB_CI": True,
                 "artifactsURL": artifactsURL,
@@ -285,7 +280,6 @@ for builder_name in BUILDERS_INSTALL:
                 "systemdCapability": "yes",
                 "needsGalera": "yes",
                 "dist_name": os_name,
-                "version_name": OS_INFO[os_info_name]["version_name"],
                 "arch": platform,
                 "test_mode": "server",
                 "test_type": "major",
@@ -312,7 +306,6 @@ for builder_name in BUILDERS_INSTALL:
                 "needsGalera": "yes",
                 "dist_name": os_name,
                 "arch": platform,
-                "version_name": OS_INFO[os_info_name]["version_name"],
                 "test_mode": "all",
                 "test_type": "minor",
                 "BB_CI": True,
@@ -335,6 +328,7 @@ for builder_name in BUILDERS_INSTALL:
                 "systemdCapability": "yes",
                 "needsGalera": "no",
                 "dist_name": os_name,
+                "arch": platform,
                 "test_mode": "columnstore",
                 "test_type": "minor",
                 "BB_CI": True,

os_info.yaml

@@ -50,7 +50,6 @@ centos-stream10:
   type: rpm
 debian-11:
   image_tag: debian11
-  version_name: bullseye
   tags:
     - release_packages
   arch:
@@ -59,7 +58,6 @@ debian-11:
   type: deb
 debian-12:
   image_tag: debian12
-  version_name: bookworm
   tags:
     - release_packages
   arch:
@@ -70,7 +68,6 @@ debian-12:
   type: deb
 debian-13:
   image_tag: debian13
-  version_name: trixie
   tags:
     - release_packages
   arch:
@@ -81,7 +78,6 @@ debian-13:
   type: deb
 debian-sid:
   image_tag: debiansid
-  version_name: sid
   tags:
     - release_packages
     - bleeding-edge
@@ -197,7 +193,6 @@ ubuntu-2204:
   image_tag: ubuntu22.04
   tags:
     - release_packages
-  version_name: jammy
   arch:
     - amd64
     - aarch64
@@ -208,7 +203,6 @@ ubuntu-2404:
   image_tag: ubuntu24.04
   tags:
     - release_packages
-  version_name: noble
   arch:
     - amd64
     - aarch64
@@ -219,7 +213,6 @@ ubuntu-2410:
   image_tag: ubuntu24.10
   tags:
     - release_packages
-  version_name: oracular
   arch:
     - amd64
     - aarch64
@@ -228,7 +221,6 @@ ubuntu-2504:
   image_tag: ubuntu25.04
   tags:
     - release_packages
-  version_name: plucky
   arch:
     - amd64
     - aarch64

scripts/bash_lib.sh

@@ -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/$dist_name/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/$dist_name/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 $dist_name $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/$dist_name $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

scripts/deb-upgrade.sh

@@ -29,15 +29,17 @@ bb_log_info "Current test mode: $test_mode"
 
 set -x
 
+source /etc/os-release
+
 # Prepare apt repository configuration for installation of the previous major
 # version
 deb_setup_mariadb_mirror "$prev_major_version"
 
 get_packages_file_mirror() {
   set -u
-  if ! wget "$baseurl/$dist_name/dists/$version_name/main/binary-$(deb_arch)/Packages"
+  if ! wget "$baseurl/$dist_name/dists/$VERSION_CODENAME/main/binary-$(deb_arch)/Packages"
   then
-    bb_log_err "Could not find the 'Packages' file for $dist_name $version_name on deb|archive.mariadb.org."
+    bb_log_err "Could not find the 'Packages' file for $dist_name $VERSION_CODENAME on deb|archive.mariadb.org."
     exit 1
   fi
   set +u
@@ -76,7 +78,7 @@ case $test_mode in
     if ! grep columnstore Packages >/dev/null; then
       bb_log_warn "Columnstore was not found in packages, the test will not be run"
       exit
-    elif [[ $version_name == "sid" ]]; then
+    elif [[ $VERSION_CODENAME == "sid" ]]; then
       bb_log_warn "Columnstore isn't necessarily built on Sid, the test will be skipped"
       exit
     fi