Skip to content

Commit 4f91cc4

Browse files
authored
DAOS-12023 ci: Add HW Medium Provider stages (#347)
Adding support for the new Functional Hardware Medium <name> Provider stages. These new functional test stages require a fixed test provider setting and will run any appropriately sized test with the 'provider' tag. Signed-off-by: Phil Henderson <phillip.henderson@intel.com>
1 parent 940fa41 commit 4f91cc4

File tree

2 files changed

+22
-4
lines changed

2 files changed

+22
-4
lines changed

vars/parseStageInfo.groovy

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,19 @@ void call(Map config = [:]) {
223223
result['pragma_suffix'] = '-hw-small'
224224
} else if (stage_name.contains('Medium')) {
225225
result['node_count'] = 5
226-
cluster_size = 'hw,medium'
226+
cluster_size = 'hw,medium,-provider'
227227
result['pragma_suffix'] = '-hw-medium'
228+
if (stage_name.contains('Provider')) {
229+
cluster_size = 'hw,medium,provider'
230+
if (stage_name.contains('Verbs')) {
231+
result['pragma_suffix'] += '-verbs-provider'
232+
ftest_arg_provider = 'ofi+verbs'
233+
}
234+
else if (stage_name.contains('UCX')) {
235+
result['pragma_suffix'] += '-ucx-provider'
236+
ftest_arg_provider = 'ucx+dc_x'
237+
}
238+
}
228239
} else if (stage_name.contains('Hardware 24')) {
229240
result['node_count'] = 24
230241
cluster_size = 'hw,24'
@@ -282,9 +293,12 @@ void call(Map config = [:]) {
282293
ftest_arg_repeat = params.TestRepeat ?: cachedCommitPragma(
283294
'Test-repeat' + result['pragma_suffix'], cachedCommitPragma('Test-repeat', null))
284295

285-
// Get the ftest --provider argument from either the build parameters or commit pragmas
286-
ftest_arg_provider = params.TestProvider ?: cachedCommitPragma(
287-
'Test-provider' + result['pragma_suffix'], cachedCommitPragma('Test-provider', null))
296+
// Get the ftest --provider argument from either the build parameters or commit pragmas if not
297+
// already defined by the stage
298+
if (!ftest_arg_provider) {
299+
ftest_arg_provider = params.TestProvider ?: cachedCommitPragma(
300+
'Test-provider' + result['pragma_suffix'], cachedCommitPragma('Test-provider', null))
301+
}
288302

289303
// Assemble the ftest args
290304
result['ftest_arg'] = ''

vars/skipStage.groovy

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -520,6 +520,10 @@ boolean call(Map config = [:]) {
520520
case 'Functional_Hardware_Medium':
521521
case 'Functional Hardware Medium':
522522
return skip_ftest_hw('medium', target_branch)
523+
case 'Functional Hardware Medium Verbs Provider':
524+
return skip_ftest_hw('medium-verbs-provider', target_branch)
525+
case 'Functional Hardware Medium UCX Provider':
526+
return skip_ftest_hw('medium-ucx-provider', target_branch)
523527
case 'Functional_Hardware_Large':
524528
case 'Functional Hardware Large':
525529
return skip_ftest_hw('large', target_branch)

0 commit comments

Comments
 (0)