DAOS-16500 test: Use daos 15.5 RPMs on Leap 15.6 image (#452)

Provision the Functional on Leap 15.6 stage with the 15.6 image but
install daos 15.5 RPMs as building 15.6 daos RPMs is not yet supported.

Signed-off-by: Phil Henderson <[email protected]>

Author: phender

vars/functionalTest.groovy

@@ -65,6 +65,10 @@ Map call(Map config = [:]) {
 
     Map stage_info = parseStageInfo(config)
 
+    String image_version = config.get(
+        'image_version',
+        (stage_info['ci_target'] =~ /([a-z]+)(.*)/)[0][1] + stage_info['distro_version'])
+
     // Install any additional rpms required for this stage
     String stage_inst_rpms = config.get('inst_rpms', '')
     if (stage_info['stage_rpms']) {
@@ -83,7 +87,7 @@ Map call(Map config = [:]) {
     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: stage_inst_rpms)
 

vars/getFunctionalTestStage.groovy

@@ -18,6 +18,7 @@ import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
  *      default_nvme    launch.py --nvme argument to use when no parameter or commit pragma exist
  *      provider        launch.py --provider argument to use
  *      distro          functional test stage distro (VM)
+ *      image_version   image version to use for provisioning, e.g. el8.8, leap15.6, etc.
  *      base_branch     if specified, checkout sources from this branch before running tests
  *      run_if_pr       whether or not the stage should run for PR builds
  *      run_if_landing  whether or not the stage should run for landing builds
@@ -35,6 +36,7 @@ Map call(Map kwargs = [:]) {
     String default_nvme = kwargs.get('default_nvme')
     String provider = kwargs.get('provider', '')
     String distro = kwargs.get('distro')
+    String image_version = kwargs.get('image_version', null)
     String base_branch = kwargs.get('base_branch')
     String other_packages = kwargs.get('other_packages', '')
     Boolean run_if_pr = kwargs.get('run_if_pr', false)
@@ -78,6 +80,7 @@ Map call(Map kwargs = [:]) {
                             job_status,
                             name,
                             functionalTest(
+                                image_version: image_version,
                                 inst_repos: daosRepos(distro),
                                 inst_rpms: functionalPackages(1, next_version, 'tests-internal') + ' ' + other_packages,
                                 test_tag: tags,

vars/parseStageInfo.groovy

@@ -103,7 +103,8 @@ Map call(Map config = [:]) {
             new_ci_target = cachedCommitPragma('LEAP15-target', result['target'])
         } else if (stage_name.contains('Leap 15.6')) {
             result['target'] = 'leap15'
-            result['distro_version'] = cachedCommitPragma('LEAP15-version', '15.6')
+            // Until a mock opensuse-leap-15.6-x86-64.cfg is available provision with 15.5
+            result['distro_version'] = cachedCommitPragma('LEAP15-version', '15.5')
             new_ci_target = cachedCommitPragma('LEAP15-target', result['target'])
         } else if (stage_name.contains('Leap 15')) {
             result['target'] = 'leap15'