DAOS-19247 test: Support scripted Test stages by phender · Pull Request #526 · daos-stack/pipeline-lib

phender · 2026-07-01T22:44:33Z

Add support for scripted fault injection and RPM test stages.

Add support for scripted fault injection and RPM test stages. Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>

phender · 2026-07-01T23:14:02Z

Testing new functionality in daos-stack/daos#18597

Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>

phender · 2026-07-02T21:04:13Z

Downstream testing skipped as it will not test the new groovy code. New code verified as part of daos-stack/daos#18597

Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>

grom72 · 2026-07-09T19:08:00Z

+ *
+ * @param kwargs Map containing the following optional arguments (empty strings yield defaults):
+ *      name                  test stage name
+ *      runStage              whether or not to run the test stage


Suggested change

* runStage whether or not to run the test stage

* runStage whether or not to run the test stage; defaults to true

Fixed in 8cf3e29

grom72 · 2026-07-09T19:08:35Z

+ *      name                  test stage name
+ *      runStage              whether or not to run the test stage
+ *      label                 test stage default cluster label
+ *      testBranch            if specified, checkout sources from this branch before running tests


Suggested change

* testBranch if specified, checkout sources from this branch before running tests

* testBranch if specified, checkout sources from this branch before running tests; defaults to ''

Fixed in 8cf3e29

Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>

grom72 · 2026-07-10T06:33:52Z

+        'test_script': kwargs.get('testScript', ''),
+        'with_valgrind': kwargs.get('withValgrind', ''),
+        'always_script': kwargs.get('alwaysScript', ''),
+        'test_results': kwargs.get('testResults', 'nlt-junit.xml'),


Isn't it the case that unitTest expects testResults instead of test_results?

pipeline-lib/vars/unitTest.groovy

Line 234 in cb6b602

p['testResults'] = config.get('testResults',

Suggested change

'test_results': kwargs.get('testResults', 'nlt-junit.xml'),

'testResults': kwargs.get('testResults', 'nlt-junit.xml'),

grom72 · 2026-07-10T06:44:19Z

+ * @param kwargs Map containing the following optional arguments (empty strings yield defaults):
+ *      name                  test stage name
+ *      runStage              whether or not to run the test stage
+ *      label                 test stage default cluster label
+ *      testBranch            if specified, checkout sources from this branch before running tests
+ *      jobStatus             Map of status for each stage in the job/build
+ *      distro                the distro to use for the test stage, e.g. 'el9'; defaults to ''
+ *      timeoutTime           unitTest() timeout time in minutes; defaults to 60
+ *      instRepos             unitTest() inst_repos argument; defaults to daosRepos()
+ *      testScript            unitTest() test_script argument; defaults to ''
+ *      withValgrind          unitTest() with_valgrind argument; defaults to ''
+ *      alwaysScript          unitTest() always_script argument, e.g.
+ *                              'ci/unit/test_nlt_post.sh'; defaults to ''
+ *      testResults           unitTest() test_results argument; defaults to 'nlt-junit.xml'
+ *      unstashOpt            unitTest() unstash_opt argument; defaults to true
+ *      unstashTests          unitTest() unstash_tests argument; defaults to false
+ *      instRpms              unitTest() inst_rpms argument; defaults to
+ *                              unitPackages(target: distro) + ' daos-client-tests'
+ *      imageVersion          unitTest() image_version argument, e.g 'el9.7'; defaults to ''
+ *      provEnvVars           unitTest() prov_env_vars argument; defaults to ''
+ *      unitTestPostArgs      Map of arguments to pass to unitTestPost() for the stage
+ *      archiveArtifactsArgs  Map of arguments to pass to archiveArtifacts() for the stage
+ * @return a scripted stage to run in a pipeline


Shouldn't we let the unitTest() function determine the default settings?

grom72 · 2026-07-10T06:56:22Z

+ */
+Map call(Map kwargs = [:]) {
+    // General parameters
+    String name = kwargs.get('name', 'Unknown Unit Test Stage')


Should we have name as mandatory parameter and fail fast if not provided?

grom72 · 2026-07-10T06:56:51Z

+    Map unitTestArgs = [
+        'timeout_time': kwargs.get('timeoutTime', 60),
+        'inst_repos': kwargs.get('instRepos', daosRepos(distro)),
+        'test_script': kwargs.get('testScript', ''),
+        'with_valgrind': kwargs.get('withValgrind', ''),
+        'always_script': kwargs.get('alwaysScript', ''),
+        'test_results': kwargs.get('testResults', 'nlt-junit.xml'),
+        'unstash_opt': kwargs.get('unstashOpt', true),
+        'unstash_tests': kwargs.get('unstashTests', false),
+        'inst_rpms': kwargs.get('instRpms', unitPackages(target: distro) + ' daos-client-tests'),
+        'image_version': kwargs.get('imageVersion', ''),
+        'prov_env_vars': kwargs.get('provEnvVars', '')
+    ]


If we have same names here as in unitTest() we can just iterate over kwargs to create the map automatically:

Suggested change

Map unitTestArgs = [

'timeout_time': kwargs.get('timeoutTime', 60),

'inst_repos': kwargs.get('instRepos', daosRepos(distro)),

'test_script': kwargs.get('testScript', ''),

'with_valgrind': kwargs.get('withValgrind', ''),

'always_script': kwargs.get('alwaysScript', ''),

'test_results': kwargs.get('testResults', 'nlt-junit.xml'),

'unstash_opt': kwargs.get('unstashOpt', true),

'unstash_tests': kwargs.get('unstashTests', false),

'inst_rpms': kwargs.get('instRpms', unitPackages(target: distro) + ' daos-client-tests'),

'image_version': kwargs.get('imageVersion', ''),

'prov_env_vars': kwargs.get('provEnvVars', '')

]

Set wrapperKeys = [

'name',

'runStage',

'label',

'testBranch',

'jobStatus',

'distro',

'unitTestPostArgs',

'archiveArtifactsArgs'

] as Set

Map unitTestArgs = new LinkedHashMap(kwargs)

unitTestArgs.keySet().removeAll(wrapperKeys)

If you want to introduce new names the following structure can be easier to read:

Map keyMap = [ timeoutTime : 'timeout_time', instRepos : 'inst_repos', testScript : 'test_script', withValgrind: 'with_valgrind', alwaysScript: 'always_script', testResults : 'test_results', unstashOpt : 'unstash_opt', unstashTests: 'unstash_tests', instRpms : 'inst_rpms', imageVersion: 'image_version', provEnvVars : 'prov_env_vars' ] Map unitTestArgs = [:] keyMap.each { inKey, outKey -> if (kwargs.containsKey(inKey)) { unitTestArgs[outKey] = kwargs[inKey] } }

grom72 · 2026-07-10T06:58:08Z

+        'test_script': kwargs.get('testScript', ''),
+        'with_valgrind': kwargs.get('withValgrind', ''),
+        'always_script': kwargs.get('alwaysScript', ''),
+        'test_results': kwargs.get('testResults', 'nlt-junit.xml'),


Is it a proper default?
The primary goal of this function will be to handle unit tests. NLT and FI is a special case.

DAOS-19247 test: Support scripted Test stages

5db34af

Add support for scripted fault injection and RPM test stages. Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>

phender marked this pull request as draft July 2, 2026 02:36

phender added 8 commits July 1, 2026 22:53

Restore getFunctionalTestStage.groovy

ef5d151

Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>

Updates.

09d02ef

Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>

Debug

0f14bd5

Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>

Debug

d677368

Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>

Updates

82667f5

Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>

Updates

ffc879a

Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>

Updates

5afdaea

Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>

Fixes.

b22f783

Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>

phender marked this pull request as ready for review July 2, 2026 21:02

phender requested review from JohnMalmberg, daltonbohning and grom72 July 2, 2026 21:03

Support passing in the distro arg to provisionNodes

89f8bc1

Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>

phender mentioned this pull request Jul 7, 2026

DAOS-19248 test: Fix no tag match for Functional VM stages daos-stack/daos#18597

Open

6 tasks

Merge branch 'master' into hendersp/DAOS-19247-fix

acce7e9

Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>

daltonbohning reviewed Jul 7, 2026

View reviewed changes

Comment thread vars/scriptedDockerStage.groovy Outdated

Comment thread vars/scriptedDockerStage.groovy Outdated

Comment thread vars/scriptedDockerStage.groovy Outdated

Remove unused code.

efb52c0

Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>

phender requested review from daltonbohning and ryon-jensen July 7, 2026 19:05

phender added 3 commits July 8, 2026 23:02

Merge branch 'master' into hendersp/DAOS-19247-fix

ab0e990

Cleanup defaults.

633079a

Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>

Groovylint fixes

304ab81

Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>

daltonbohning previously approved these changes Jul 9, 2026

View reviewed changes

phender added the forced-landing The PR has known failures or intentionally reduced testing, but should still be landed label Jul 9, 2026

grom72 requested changes Jul 9, 2026

View reviewed changes

Applying feedback.

8cf3e29

Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>

phender dismissed daltonbohning’s stale review via 8cf3e29 July 9, 2026 20:44

phender requested review from daltonbohning and grom72 July 9, 2026 20:44

daltonbohning previously approved these changes Jul 9, 2026

View reviewed changes

phender added 2 commits July 9, 2026 17:56

Fix skipping functional test stage due to no tag match

61a43af

Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>

Update tag fit check for functional test stages

1a3cdef

Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>

phender dismissed daltonbohning’s stale review via 1a3cdef July 9, 2026 23:40

Debug

1950b3a

Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>

grom72 requested changes Jul 10, 2026

View reviewed changes

	* runStage whether or not to run the test stage
	* runStage whether or not to run the test stage; defaults to true

	* testBranch if specified, checkout sources from this branch before running tests
	* testBranch if specified, checkout sources from this branch before running tests; defaults to ''

	'test_results': kwargs.get('testResults', 'nlt-junit.xml'),
	'testResults': kwargs.get('testResults', 'nlt-junit.xml'),

Uh oh!

Conversation

phender commented Jul 1, 2026

Uh oh!

phender commented Jul 1, 2026

Uh oh!

phender commented Jul 2, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants