Skip to content

Commit 14c8bdf

Browse files
committed
DAOS-11624 test: Adding support for the Test-storage-tier pragma
Adding support for passing the Test-storage-tier build parameter or commit pragma to launch.py via its --storage_tier argument. Signed-off-by: Phil Henderson <phillip.henderson@intel.com>
1 parent 4f91cc4 commit 14c8bdf

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

vars/parseStageInfo.groovy

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ void call(Map config = [:]) {
208208
String ftest_arg_nvme = ''
209209
String ftest_arg_repeat = ''
210210
String ftest_arg_provider = ''
211+
String ftest_arg_storage_tier = ''
211212
if (stage_name.contains('Functional')) {
212213
result['test'] = 'Functional'
213214
result['node_count'] = 9
@@ -300,6 +301,10 @@ void call(Map config = [:]) {
300301
'Test-provider' + result['pragma_suffix'], cachedCommitPragma('Test-provider', null))
301302
}
302303

304+
// Get the ftest --storage_tier argument from either the build parameters or commit pragmas
305+
ftest_arg_storage_tier = params.TestStorageTier ?: cachedCommitPragma(
306+
'Test-storage-tier' + result['pragma_suffix'], cachedCommitPragma('Test-storage-tier', null))
307+
303308
// Assemble the ftest args
304309
result['ftest_arg'] = ''
305310
if (ftest_arg_nvme) {
@@ -311,6 +316,9 @@ void call(Map config = [:]) {
311316
if (ftest_arg_provider) {
312317
result['ftest_arg'] += ' --provider=' + ftest_arg_provider
313318
}
319+
if (ftest_arg_storage_tier) {
320+
result['ftest_arg'] += ' --storage_tier=' + ftest_arg_storage_tier
321+
}
314322
if (result['ftest_tag']) {
315323
result['ftest_tag'] = result['ftest_tag'].trim()
316324
}

0 commit comments

Comments
 (0)