SRE-3704 ci: adapt NLT pipeline to cover Fault Injection testing procedure.

vars/parseStageInfo.groovy

@@ -287,10 +287,14 @@ Map call(Map config = [:]) {
 
     if (stage_name.contains('NLT')) {
         result['NLT'] = true
-        result['valgrind_pattern'] = config.get('valgrind_pattern', '*memcheck.xml')
         result['always_script'] = config.get('always_script', 'ci/unit/test_nlt_post.sh')
         result['testResults'] = config.get('testResults', 'nlt-junit.xml')
-        result['with_valgrind'] = 'memcheck'
+        if (stage_name.toLowerCase().contains('nlt fault injection')) {
+            result['FI'] = true
+        } else {
+            result['valgrind_pattern'] = config.get('valgrind_pattern', '*memcheck.xml')
+            result['with_valgrind'] = 'memcheck'
+        }
     } else {
         result['NLT'] = false
         if (config['valgrind_pattern']) {

vars/rpmDistValue.groovy

@@ -21,7 +21,7 @@ String call(String distro) {
                distro.startsWith('rocky9') || distro.startsWith('almalinux9') ||
                distro.startsWith('rhel9')) {
         return '.el9'
-    } else if (distro.startsWith('leap15')) {
+    } else if (distro.startsWith('leap15') || distro.startsWith('sles15')) {
         return '.suse.lp' + parseStageInfo()['distro_version'].replaceAll('\\.', '')
     }
     error("Don't know what the RPM %{dist} is for ${distro}")

vars/skipStage.groovy

@@ -434,6 +434,7 @@ boolean call(Map config = [:]) {
             skip_ftest('ubuntu20', target_branch, tags) */
             return true
         case 'Fault injection testing':
+        case 'NLT Fault injection testing':
         case 'Fault injection testing on CentOS 8':
         case 'Fault injection testing on EL 8':
         case 'Fault injection testing on EL 8.8':

vars/unitTest.groovy

@@ -72,7 +72,13 @@
    *
    * 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.
+   * config['image_version']     Image version to use for provisioning,
+   *                             e.g. el8.8, leap15.6, etc.
+   *
+   * config['prov_env_vars']     Optional provisioning environment to use.
+   *                             Default ''.
+   *                             Formatted as 'KEY=VALUE' space-separated pairs
+   *                             and passed to the provisionNodesSystem call.
    */
 
 Map afterTest(Map config, Map testRunInfo) {
@@ -94,7 +100,7 @@ Map afterTest(Map config, Map testRunInfo) {
     } else {
         result['result'] = checkJunitFiles(testResults: testResults)
     }
-    if (config['with_valgrind'] || config['NLT']) {
+    if (config['with_valgrind']) {
         vgrcs = sh label: 'Check for Valgrind errors',
                    script: "grep -E '<error( |>)' ${valgrind_pattern} || true",
                    returnStdout: true
@@ -146,7 +152,8 @@ Map call(Map config = [:]) {
                  node_count: stage_info['node_count'],
                  distro: image_version,
                  inst_repos: config.get('inst_repos', ''),
-                 inst_rpms: inst_rpms)
+                 inst_rpms: inst_rpms,
+                 prov_env_vars: config.get('prov_env_vars', ''))
 
     /* el9-gcc-tests */
     String target_stash = (image_version ?: ${stage_info['target']}).split('\\.')[0]

vars/unitTestPost.groovy

@@ -23,8 +23,6 @@
    *                               Required if more than one stage is
    *                               creating Valgrind reports.
    */
-
-// groovylint-disable DuplicateStringLiteral, VariableName
 /* groovylint-disable-next-line MethodSize */
 void call(Map config = [:]) {
     Map stage_info = parseStageInfo(config)
@@ -66,7 +64,7 @@ void call(Map config = [:]) {
         junit testResults: testResults,
               healthScaleFactor: health_scale
     }
-    if (stage_info['with_valgrind'] || stage_info['NLT']) {
+    if (stage_info['with_valgrind']) {
         String suite = sanitizedStageName()
         int vgfail = 0
         String testdata
@@ -112,6 +110,14 @@ void call(Map config = [:]) {
                                                            'daos-stack/daos/master'),
                                   scm: 'daos-stack/daos',
                                   requiredResult: 'UNSTABLE')
+        List nltTools = [issues(pattern: 'vm_test/nlt-errors.json',
+                                name: stage_info['FI'] ? 'Fault injection' : 'NLT errors',
+                                id: sanitizedStageName() + '_VM_test')]
+        if (stage_info['FI']) {
+            nltTools << issues(pattern: 'nlt-client-leaks.json',
+                               name: 'Fault injection leaks',
+                               id: 'NLT_client')
+        }
         recordIssues enabledForFailure: true,
                      /* ignore warning/errors from PMDK logging system */
                      filters: [excludeFile('pmdk/.+')],
@@ -125,10 +131,8 @@ void call(Map config = [:]) {
                        [threshold: 1, type: 'TOTAL_HIGH'],
                        [threshold: 1, type: 'NEW_NORMAL', unstable: true],
                        [threshold: 1, type: 'NEW_LOW', unstable: true]],
-                     name: 'Node local testing',
-                     tool: issues(pattern: 'vm_test/nlt-errors.json',
-                                  name: 'NLT results',
-                                  id: 'VM_test'),
+                     name: stage_info['FI']?'Fault injection':'NLT',
+                     tools: nltTools,
                      scm: 'daos-stack/daos'
 
         if (cb_result != currentBuild.result) {