Skip to content

Commit 19e2837

Browse files
authored
DAOS-16500 test: Fix default image_version (#454)
Correctly use a default if image_version is not provided to functionalTest. Signed-off-by: Phil Henderson <[email protected]>
1 parent 2d7d62e commit 19e2837

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

vars/functionalTest.groovy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,8 @@ Map call(Map config = [:]) {
6565

6666
Map stage_info = parseStageInfo(config)
6767

68-
String image_version = config.get(
69-
'image_version',
70-
(stage_info['ci_target'] =~ /([a-z]+)(.*)/)[0][1] + stage_info['distro_version'])
68+
String image_version = config.get('image_version') ?:
69+
(stage_info['ci_target'] =~ /([a-z]+)(.*)/)[0][1] + stage_info['distro_version']
7170

7271
// Install any additional rpms required for this stage
7372
String stage_inst_rpms = config.get('inst_rpms', '')
@@ -84,6 +83,7 @@ Map call(Map config = [:]) {
8483
subject: 'CI Test failure - CI Configuration test issue.')
8584
}
8685

86+
echo "Running provisionNodes() on ${nodelist} with the ${image_version} image"
8787
Map runData = provisionNodes(
8888
NODELIST: nodelist,
8989
node_count: stage_info['node_count'],

0 commit comments

Comments
 (0)