Skip to content

Commit 34a0b74

Browse files
ryon-jensenryon-jensen
committed
Trying one test stage on cluster_box_3 (wlsc-209) after it has dual IB setup in VMs
Signed-off-by: Ryon Jensen <ryon.jensen@hpe.com>
1 parent e56411c commit 34a0b74

2 files changed

Lines changed: 43 additions & 38 deletions

File tree

‎Jenkinsfile‎

Lines changed: 42 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -177,13 +177,14 @@ String sconsArgs() {
177177
* Update default commit pragmas based on files modified.
178178
*/
179179
Map update_default_commit_pragmas() {
180-
String default_pragmas_str = sh(script: 'ci/gen_commit_pragmas.py --target origin/' + target_branch,
181-
returnStdout: true).trim()
182-
println('pragmas from gen_commit_pragmas.py:')
183-
println(default_pragmas_str)
184-
if (default_pragmas_str) {
185-
updatePragmas(default_pragmas_str, false)
186-
}
180+
// Don't use this for now
181+
// String default_pragmas_str = sh(script: 'ci/gen_commit_pragmas.py --target origin/' + target_branch,
182+
// returnStdout: true).trim()
183+
// println('pragmas from gen_commit_pragmas.py:')
184+
// println(default_pragmas_str)
185+
// if (default_pragmas_str) {
186+
// updatePragmas(default_pragmas_str, false)
187+
// }
187188
}
188189

189190
Boolean skip_pragma_set(String name, String def_val='false') {
@@ -1115,6 +1116,7 @@ pipeline {
11151116
steps {
11161117
script {
11171118
Map hwStages = [
1119+
:
11181120
// 'Functional Hardware Medium': getFunctionalTestStage(
11191121
// name: 'Functional Hardware Medium',
11201122
// pragma_suffix: '-hw-medium',
@@ -1127,18 +1129,18 @@ pipeline {
11271129
// run_if_landing: false,
11281130
// job_status: job_status_internal
11291131
// ),
1130-
'Functional Hardware Medium MD on SSD': getFunctionalTestStage(
1131-
name: 'Functional Hardware Medium MD on SSD',
1132-
pragma_suffix: '-hw-medium-md-on-ssd',
1133-
label: params.FUNCTIONAL_HARDWARE_MEDIUM_LABEL,
1134-
next_version: next_version(),
1135-
stage_tags: 'hw,medium,-provider',
1136-
default_tags: startedByTimer() ? 'pr daily_regression' : 'pr',
1137-
nvme: 'auto_md_on_ssd',
1138-
run_if_pr: true,
1139-
run_if_landing: false,
1140-
job_status: job_status_internal
1141-
)
1132+
// 'Functional Hardware Medium MD on SSD': getFunctionalTestStage(
1133+
// name: 'Functional Hardware Medium MD on SSD',
1134+
// pragma_suffix: '-hw-medium-md-on-ssd',
1135+
// label: params.FUNCTIONAL_HARDWARE_MEDIUM_LABEL,
1136+
// next_version: next_version(),
1137+
// stage_tags: 'hw,medium,-provider',
1138+
// default_tags: startedByTimer() ? 'pr daily_regression' : 'pr',
1139+
// nvme: 'auto_md_on_ssd',
1140+
// run_if_pr: true,
1141+
// run_if_landing: false,
1142+
// job_status: job_status_internal
1143+
// )
11421144
// 'Functional Hardware Medium VMD': getFunctionalTestStage(
11431145
// name: 'Functional Hardware Medium VMD',
11441146
// pragma_suffix: '-hw-medium-vmd',
@@ -1236,14 +1238,15 @@ pipeline {
12361238
// Static/commented stages can be added here if needed
12371239

12381240
List<Map> clusterBoxStageConfigs = [
1241+
[stage_tag: 'SnapshotAggregation', label: 'cluster_box_3'],
12391242
/*
12401243
12411244
// Passing
12421245
[stage_tag: 'DaosCoreTestRebuild', label: 'cluster_box'],
12431246
[stage_tag: 'PoolCreateTests', label: 'cluster_box'],
1247+
12441248
[stage_tag: 'TestWithTelemetryNvme', label: 'cluster_box'],
12451249
1246-
[stage_tag: 'SnapshotAggregation', label: 'cluster_box_3'],
12471250
[stage_tag: 'AggregationChecksum', label: 'cluster_box'],
12481251
[stage_tag: 'OSAOnlineParallelTest', label: 'cluster_box'],
12491252
[stage_tag: 'RbldPoolDestroyWithIO', label: 'cluster_box'],
@@ -1259,8 +1262,8 @@ pipeline {
12591262

12601263
// Attempting these again:
12611264
// these don't look like it ran anything
1262-
[stage_tag: 'TestWithScrubberFault', label: 'cluster_box_3'],
1263-
[stage_tag: 'TestWithScrubberTargetEviction', label: 'cluster_box_3'],
1265+
// [stage_tag: 'TestWithScrubberFault', label: 'cluster_box_3'],
1266+
// [stage_tag: 'TestWithScrubberTargetEviction', label: 'cluster_box_3'],
12641267

12651268
/*
12661269
Don't work
@@ -1280,6 +1283,8 @@ pipeline {
12801283
clusterBoxStageConfigs.each { cfg ->
12811284
String stageTag = cfg.stage_tag
12821285
String stageKey = "Functional Cluster Box Medium MD on SSD ${stageTag}"
1286+
echo "BANG echo: stageTag: ${stageTag}, stageKey: ${stageKey}, label: ${cfg.label}"
1287+
println("BANG println: stageTag: ${stageTag}, stageKey: ${stageKey}, label: ${cfg.label}")
12831288
hwStages[stageKey] = getFunctionalTestStage(
12841289
name: stageKey,
12851290
pragma_suffix: '-cb-medium-md-on-ssd',
@@ -1295,21 +1300,21 @@ pipeline {
12951300
)
12961301
}
12971302

1298-
String excludedStageTags = clusterBoxStageConfigs.collect { cfg -> "-${cfg.stage_tag}" }.join(',')
1299-
String restStageTags = excludedStageTags ? "cb,medium,${excludedStageTags}" : 'cb,medium'
1300-
hwStages['Functional Cluster Box Medium MD on SSD rest'] = getFunctionalTestStage(
1301-
name: 'Functional Cluster Box Medium MD on SSD rest',
1302-
pragma_suffix: '-cb-medium-md-on-ssd',
1303-
label: 'cluster_box',
1304-
next_version: next_version(),
1305-
stage_tags: restStageTags,
1306-
default_tags: startedByTimer() ? 'pr daily_regression' : 'pr',
1307-
nvme: 'auto_md_on_ssd',
1308-
node_count: 5,
1309-
run_if_pr: true,
1310-
run_if_landing: false,
1311-
job_status: job_status_internal
1312-
)
1303+
// String excludedStageTags = clusterBoxStageConfigs.collect { cfg -> "-${cfg.stage_tag}" }.join(',')
1304+
// String restStageTags = excludedStageTags ? "cb,medium,${excludedStageTags}" : 'cb,medium'
1305+
// hwStages['Functional Cluster Box Medium MD on SSD rest'] = getFunctionalTestStage(
1306+
// name: 'Functional Cluster Box Medium MD on SSD rest',
1307+
// pragma_suffix: '-cb-medium-md-on-ssd',
1308+
// label: 'cluster_box',
1309+
// next_version: next_version(),
1310+
// stage_tags: restStageTags,
1311+
// default_tags: startedByTimer() ? 'pr daily_regression' : 'pr',
1312+
// nvme: 'auto_md_on_ssd',
1313+
// node_count: 5,
1314+
// run_if_pr: true,
1315+
// run_if_landing: false,
1316+
// job_status: job_status_internal
1317+
// )
13131318

13141319
parallel(hwStages)
13151320
}

‎src/tests/ftest/container/snapshot_aggregation.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def test_snapshot_aggregation(self):
4444
capacity by half.
4545
4646
:avocado: tags=all,pr,daily_regression
47-
:avocado: tags=hw,medium
47+
:avocado: tags=cb,medium
4848
:avocado: tags=container,snap
4949
:avocado: tags=SnapshotAggregation,test_snapshot_aggregation
5050
"""

0 commit comments

Comments
 (0)