From fd0bd3c225fcd0ed6e4735ab1307e14fba52c627 Mon Sep 17 00:00:00 2001
From: Anushree-Mathur <anushree.mathur@linux.ibm.com>
Date: Thu, 4 Jun 2026 14:42:01 +0530
Subject: [PATCH] avocado-setup: Support minor version-specific package
 dependencies

Currently, bootstrap only supports major version package definitions.
This prevents handling packages that exist only in specific minor
versions of an OS.

This commit adds minor version support by:
- Tracking both major and full version identifiers
- Checking version-specific sections first (e.g., deps_<os><major>_<minor>)
- Falling back to major version sections if not found
- Applying same logic to environment-type packages (kvm, NV, pHyp)

Example config usage:
  [deps_rhel9_3]
  packages = version-specific-package

Signed-off-by: Anushree-Mathur <anushree.mathur@linux.ibm.com>
---
 avocado-setup.py | 36 +++++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/avocado-setup.py b/avocado-setup.py
index 87e3165..e5c6e86 100644
--- a/avocado-setup.py
+++ b/avocado-setup.py
@@ -135,16 +135,27 @@ def env_check(enable_kvm):
     (env_ver, env_type, cmd_pat) = helper.get_env_type(enable_kvm)
     # try to check base packages using major version numbers
     env_ver = env_ver.split('.')[0]
+    env_ver_full = env_ver.replace('.', '_')  # Full version with underscore
     env_deps = []
-    if not CONFIGFILE.has_section('deps_%s' % env_ver):
+    # Try full version first (e.g., deps_sles16_1)
+    if CONFIGFILE.has_section('deps_%s' % env_ver_full):
+        packages = CONFIGFILE.get('deps_%s' % env_ver_full, 'packages')
+        if packages != '':
+            env_deps = packages.split(',')
+    # Fallback to major version (e.g., deps_sles16)
+    elif CONFIGFILE.has_section('deps_%s' % env_ver_major):
+        packages = CONFIGFILE.get('deps_%s' % env_ver_major, 'packages')
+        if packages != '':
+            env_deps = packages.split(',')
+    else:
         # Fallback to base name if specific version is not found
         dist = helper.get_dist()
-        env_ver = dist[0]
+        env_ver_major = dist[0]
+        if CONFIGFILE.has_section('deps_%s' % env_ver_major):
+            packages = CONFIGFILE.get('deps_%s' % env_ver_major, 'packages')
+            if packages != '':
+                env_deps = packages.split(',')
 
-    if CONFIGFILE.has_section('deps_%s' % env_ver):
-        packages = CONFIGFILE.get('deps_%s' % env_ver, 'packages')
-        if packages != '':
-            env_deps = packages.split(',')
     for dep in env_deps:
         if(dep[-1] == "$"):
             #Substrings
@@ -161,12 +172,19 @@ def env_check(enable_kvm):
             not_found.append(original_dep)
 
     env_deps = []
-    # try to check env specific packages
-    if CONFIGFILE.has_section('deps_%s_%s' % (env_ver, env_type)):
+    # try to check env specific packages (with full version first)
+    if CONFIGFILE.has_section('deps_%s_%s' % (env_ver_full, env_type)):
         packages = CONFIGFILE.get('deps_%s_%s' %
-                                  (env_ver, env_type), 'packages')
+                                  (env_ver_full, env_type), 'packages')
         if packages != '':
             env_deps = packages.split(',')
+    # Fallback to major version with env_type
+    elif CONFIGFILE.has_section('deps_%s_%s' % (env_ver_major, env_type)):
+        packages = CONFIGFILE.get('deps_%s_%s' %
+                                  (env_ver_major, env_type), 'packages')
+        if packages != '':
+            env_deps = packages.split(',')
+
     for dep in env_deps:
         if helper.runcmd(cmd_pat % dep, ignore_status=True)[0] != 0:
             not_found.append(dep)