add image_version parameter for unitTest.groovy

Signed-off-by: Oksana Salyk <oksana.salyk@hpe.com>

Author: osalyk

vars/parseStageInfo.groovy

@@ -88,6 +88,10 @@ Map call(Map config = [:]) {
             result['distro_version'] = cachedCommitPragma('EL8-version',
                                                           distroVersion(result['target']))
             new_ci_target = cachedCommitPragma('EL8-target', result['target'])
+        } else if (stage_name.contains('EL 9.6')) {
+            result['target'] = 'el9.6'
+            result['distro_version'] = cachedCommitPragma('EL9.6-version', '9.6')
+            new_ci_target = cachedCommitPragma('EL9.6-target', result['target'])
         } else if (stage_name.contains('EL 9')) {
             result['target'] = 'el9'
             result['distro_version'] = cachedCommitPragma('EL9-version',

vars/provisionNodes.groovy

@@ -142,9 +142,11 @@ Map call(Map config = [:]) {
             provision_script += 'EL_7'
             break
     case 'el8':
-    case 'el9':
             provision_script += 'EL_8'
             break
+    case 'el9':
+            provision_script += 'EL_9'
+            break
     case 'suse':
             provision_script += 'LEAP_15'
             break

vars/unitPackages.groovy

@@ -11,7 +11,7 @@
  * Method to return the list of Unit Testing packages
  */
 
-String call() {
+String call(Map args = [:]) {
     String script = 'ci/unit/required_packages.sh'
     if (!fileExists(script)) {
         echo "${script} doesn't exist.  " +
@@ -20,7 +20,8 @@ String call() {
     }
 
     Map stage_info = parseStageInfo()
-    String target = stage_info['target']
+    String target = args.get('image_version') ?:
+        (stage_info['target'] =~ /([a-z]+)(.*)/)[0][1] + stage_info['distro_version']
     boolean quick_build = quickBuild()
 
     if (target.startsWith('centos') || target.startsWith('el')) {

vars/unitTest.groovy

@@ -71,6 +71,8 @@
    *                             default is false.
    *
    * config['unstash_tests']     Un-stash -tests, default is true.
+   *
+   * config['image_version']     Image version to use for provisioning, e.g. el8.8, leap15.6, etc.
    */
 
 Map afterTest(Map config, Map testRunInfo) {
@@ -136,18 +138,22 @@ Map call(Map config = [:]) {
         }
     }
 
+    String image_version = config.get('image_version', '') ?:
+        (stage_info['ci_target'] =~ /([a-z]+)(.*)/)[0][1] + stage_info['distro_version']
+
+    println("image_version = ${image_version}")
     Map runData = provisionNodes(
                  NODELIST: nodelist,
                  node_count: stage_info['node_count'],
-                 distro: (stage_info['ci_target'] =~
-                          /([a-z]+)(.*)/)[0][1] + stage_info['distro_version'],
+                 distro: image_version,
                  inst_repos: config.get('inst_repos', ''),
                  inst_rpms: inst_rpms)
-
-    String target_stash = "${stage_info['target']}-${stage_info['compiler']}"
+    // image_version-compiler-build_type
+    String target_stash = "${image_version}-${stage_info['compiler']}"
     if (stage_info['build_type']) {
         target_stash += '-' + stage_info['build_type']
     }
+    println("target_stash = ${target_stash}")
 
     List stashes = []
     if (config['stashes']) {