Normalize distro platform

dc0809 · Dmitriy Rabotyagov · anfimovir · commit b04b92233285 · 2025-12-02T16:59:19.000Z
Provide a single abstract identifier for multiple distro variants, hiding OS-specific differences.

Change-Id: I19e63b792734765263cb8eae3c06b3c4e356e8a6
Co-authored-by: Dmitriy Rabotyagov &lt;dmitriy.rabotyagov@cleura.com&gt;
Signed-off-by: Dmitriy Chubinidze &lt;dcu995@gmail.com&gt;
diff --git a/scripts/bootstrap-ansible.sh b/scripts/bootstrap-ansible.sh
@@ -66,11 +66,11 @@ ssh_key_create
 determine_distro
 
 # Install the python interpreters
-case ${DISTRO_ID} in
-    centos|rhel|rocky)
+case ${DISTRO_FAMILY} in
+    *"rhel"*)
         dnf -y install python3 python3-devel python3-libselinux
         ;;
-    ubuntu|debian)
+    *"debian"*)
         apt-get update
         DEBIAN_FRONTEND=noninteractive apt-get -y install \
           python3 python3-dev \
@@ -80,15 +80,15 @@ case ${DISTRO_ID} in
 esac
 
 # Install the base packages
-case ${DISTRO_ID} in
-    rocky|centos|rhel)
+case ${DISTRO_FAMILY} in
+    *"rhel"*)
         dnf -y install \
           git-core /usr/bin/curl gcc gcc-c++ nc \
           systemd-devel pkgconf \
           openssl-devel libffi-devel \
           rsync wget
         ;;
-    ubuntu|debian)
+    *"debian"*)
         apt-get update
         DEBIAN_FRONTEND=noninteractive apt-get -y install \
           git-core curl gcc \
diff --git a/scripts/scripts-library.sh b/scripts/scripts-library.sh
@@ -95,6 +95,7 @@ function determine_distro {
     export DISTRO_ID="${ID}"
     export DISTRO_NAME="${NAME}"
     export DISTRO_VERSION_ID=${VERSION_ID}
+    export DISTRO_FAMILY="${ID_LIKE:-""} ${ID}"
 }
 
 function ssh_key_create {
@@ -193,12 +194,12 @@ function gate_job_exit_tasks {
 function gate_log_requirements {
   # ensure packages are installed to get instance info
   determine_distro
-  case ${DISTRO_ID} in
-      ubuntu|debian)
+  case ${DISTRO_FAMILY} in
+      *"debian"*)
           apt-get update
           DEBIAN_FRONTEND=noninteractive apt-get -y install iproute2 net-tools parallel
           ;;
-      rocky|centos|rhel)
+      *"rhel"*)
           dnf -y install epel-release
           sed -i 's/\[epel\]/&\nincludepkgs=parallel/' /etc/yum.repos.d/epel.repo
           dnf -y --enablerepo=epel install iproute parallel
@@ -321,12 +322,12 @@ function get_instance_info {
   ip link show > "/openstack/log/instance-info/links_${TS}.log" || true
 
   determine_distro
-  case ${DISTRO_ID} in
-      rocky|rhel)
+  case ${DISTRO_FAMILY} in
+      *"rhel"*)
           rpm -qa | sort > \
             "/openstack/log/instance-info/host_packages_info_${TS}.log" || true
           ;;
-      ubuntu|debian)
+      *"debian"*)
           dpkg-query --list > \
             "/openstack/log/instance-info/host_packages_info_${TS}.log" || true
           ;;
