Skip to content

DAOS-11624 test: Adding support for the Test-storage-tier pragma #355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

DAOS-11624 test: Adding support for the Test-storage-tier pragma #355

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
14c8bdf
DAOS-11624 test: Adding support for the Test-storage-tier pragma
phender Dec 12, 2022
555d367
Applying feedback
phender Dec 13, 2022
f5291bb
Fix 'Commit Pragma tests' stage.
phender Dec 13, 2022
e386d70
Fix get_param_or_pragma method
phender Dec 15, 2022
07afcdd
Merge branch 'master' into pahender/DAOS-11624
phender Dec 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions vars/parseStageInfo.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ void call(Map config = [:]) {
String ftest_arg_nvme = ''
String ftest_arg_repeat = ''
String ftest_arg_provider = ''
String ftest_arg_storage_tier = ''
if (stage_name.contains('Functional')) {
result['test'] = 'Functional'
result['node_count'] = 9
Expand Down Expand Up @@ -300,6 +301,10 @@ void call(Map config = [:]) {
'Test-provider' + result['pragma_suffix'], cachedCommitPragma('Test-provider', null))
}

// Get the ftest --storage_tier argument from either the build parameters or commit pragmas
ftest_arg_storage_tier = params.TestStorageTier ?: cachedCommitPragma(
'Test-storage-tier' + result['pragma_suffix'], cachedCommitPragma('Test-storage-tier', null))

// Assemble the ftest args
result['ftest_arg'] = ''
if (ftest_arg_nvme) {
Expand All @@ -311,6 +316,9 @@ void call(Map config = [:]) {
if (ftest_arg_provider) {
result['ftest_arg'] += ' --provider=' + ftest_arg_provider
}
if (ftest_arg_storage_tier) {
result['ftest_arg'] += ' --storage_tier=' + ftest_arg_storage_tier
}
Copy link
Contributor

@brianjmurrell brianjmurrell Dec 12, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Worth mentioning that this could be made more succinct with:

Suggested change
if (ftest_arg_storage_tier) {
result['ftest_arg'] += ' --storage_tier=' + ftest_arg_storage_tier
}
result['ftest_arg'] += ftest_arg_storage_tier ? ' --storage_tier=' + ftest_arg_storage_tier : ''

Or that a function could be written to make all of this more DRY, now that it's evident that it's proliferating. I.e.

String get_param_or_pragma(param, pragma, arg) {
    String res = params.$param ?: cachedCommitPragma(
      pragma + result['pragma_suffix'], cachedCommitPragma(pragma, null))

    return res ? '  --' + arg + '= ' + res : ''
}

result['ftest_arg'] += get_param_or_pragma('TestStorageTier', 'Test-storage-tier', '--storage_tier')

And of course using the above for all of the other param-or-pragma values that are built into result['ftest_arg'].

Copy link
Contributor Author

@phender phender Dec 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. I've added this change.

if (result['ftest_tag']) {
result['ftest_tag'] = result['ftest_tag'].trim()
}
Expand Down