Skip to content

Commit aef8028

Browse files
ryon-jensenryon-jensen
committed
Possible solution
Signed-off-by: Ryon Jensen <ryon.jensen@hpe.com>
1 parent 1f6a589 commit aef8028

25 files changed

Lines changed: 161 additions & 171 deletions

‎Jenkinsfile‎

Lines changed: 40 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -692,65 +692,48 @@ pipeline {
692692
}
693693
steps {
694694
script {
695-
Map hwStages = [
696-
'Functional Cluster Box Medium MD on SSD': getFunctionalTestStage(
697-
name: 'Functional Cluster Box Medium MD on SSD',
698-
pragma_suffix: '-cb-medium-md-on-ssd',
699-
label: 'cluster_box',
700-
next_version: next_version(),
701-
stage_tags: 'hw,medium,OSAOfflineReintegration',
702-
default_tags: 'pr',
703-
nvme: 'auto_md_on_ssd',
704-
run_if_pr: true,
705-
run_if_landing: false,
706-
job_status: job_status_internal,
707-
image_version: 'el9.7',
708-
node_count: 5
709-
)
695+
Map hwStages = [:]
696+
697+
hwStages['Functional Hardware Medium MD on SSD'] = getFunctionalTestStage(
698+
name: 'Functional Hardware Medium MD on SSD',
699+
pragma_suffix: '-cb-medium-md-on-ssd',
700+
label: params.FUNCTIONAL_HARDWARE_MEDIUM_LABEL,
701+
next_version: next_version(),
702+
stage_tags: 'hw,medium',
703+
default_tags: 'pr',
704+
nvme: 'auto_md_on_ssd',
705+
run_if_pr: true,
706+
run_if_landing: false,
707+
job_status: job_status_internal,
708+
image_version: 'el9.7',
709+
node_count: 5
710+
)
711+
712+
List<String> clusterBoxStageTags = [
713+
'stage_daos_test_ec',
714+
'stage_daos_test_rebuild',
715+
'stage_daos_test',
716+
'stage_ftest'
710717
]
711718

712-
List<Map> clusterBoxStageConfigs = [
713-
[stage_tag: 'AggregationChecksum', label: 'cluster_box'],
714-
[stage_tag: 'test_daos_rebuild_ec', label: 'cluster_box'],
715-
[stage_tag: 'test_daos_drain_simple', label: 'cluster_box'],
716-
[stage_tag: 'test_daos_rebuild_simple', label: 'cluster_box'],
717-
]
718-
719-
// clusterBoxStageConfigs.each { cfg ->
720-
// String stageTag = cfg.stage_tag
721-
// String stageKey = "Functional Cluster Box Medium MD on SSD ${stageTag}"
722-
// echo "BANG echo: stageTag: ${stageTag}, stageKey: ${stageKey}, label: ${cfg.label}"
723-
// println("BANG println: stageTag: ${stageTag}, stageKey: ${stageKey}, label: ${cfg.label}")
724-
// hwStages[stageKey] = getFunctionalTestStage(
725-
// name: stageKey,
726-
// pragma_suffix: '-cb-medium-md-on-ssd',
727-
// label: cfg.label,
728-
// next_version: next_version(),
729-
// stage_tags: "cb,medium,${stageTag}",
730-
// default_tags: startedByTimer() ? 'pr daily_regression' : 'pr',
731-
// nvme: 'auto_md_on_ssd',
732-
// node_count: 5,
733-
// run_if_pr: true,
734-
// run_if_landing: false,
735-
// job_status: job_status_internal
736-
// )
737-
// }
738-
739-
// String excludedStageTags = clusterBoxStageConfigs.collect { cfg -> "-${cfg.stage_tag}" }.join(',')
740-
// String restStageTags = excludedStageTags ? "cb,medium,${excludedStageTags}" : 'cb,medium'
741-
// hwStages['Functional Cluster Box Medium MD on SSD rest'] = getFunctionalTestStage(
742-
// name: 'Functional Cluster Box Medium MD on SSD rest',
743-
// pragma_suffix: '-cb-medium-md-on-ssd',
744-
// label: 'cluster_box',
745-
// next_version: next_version(),
746-
// stage_tags: restStageTags,
747-
// default_tags: startedByTimer() ? 'pr daily_regression' : 'pr',
748-
// nvme: 'auto_md_on_ssd',
749-
// node_count: 5,
750-
// run_if_pr: true,
751-
// run_if_landing: false,
752-
// job_status: job_status_internal
753-
// )
719+
clusterBoxStageTags.each { cfg ->
720+
String stageTag = cfg
721+
String stageKey = "[CB][MDonSSD] <${stageTag}>"
722+
hwStages[stageKey] = getFunctionalTestStage(
723+
name: stageKey,
724+
pragma_suffix: '-cb-medium-md-on-ssd',
725+
label: 'cluster_box',
726+
next_version: next_version(),
727+
stage_tags: "cb,medium,${stageTag}",
728+
default_tags: startedByTimer() ? 'pr daily_regression' : 'pr',
729+
nvme: 'auto_md_on_ssd',
730+
image_version: 'el9.7',
731+
node_count: 5,
732+
run_if_pr: true,
733+
run_if_landing: false,
734+
job_status: job_status_internal
735+
)
736+
}
754737

755738
parallel(hwStages)
756739
}

‎src/tests/ftest/aggregation/basic.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ hosts:
33
test_clients: 2
44
timeout: 540
55
server_config:
6+
system_ram_reserved: 16
67
name: daos_server
78
engines_per_host: 1
89
engines:

‎src/tests/ftest/daos_test/rebuild.py‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ def test_rebuild_0to10(self):
2626
Core tests for daos_test rebuild
2727
2828
:avocado: tags=all,pr,daily_regression
29-
:avocado: tags=hw,medium
29+
:avocado: tags=cb,medium
3030
:avocado: tags=unittest,rebuild
31-
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_0to10
31+
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_0to10,stage_daos_test_rebuild
3232
3333
"""
3434
self.run_subtest()
@@ -44,9 +44,9 @@ def test_rebuild_12to15(self):
4444
Core tests for daos_test rebuild
4545
4646
:avocado: tags=all,pr,daily_regression
47-
:avocado: tags=hw,2,medium
47+
:avocado: tags=cb,2,medium
4848
:avocado: tags=unittest,rebuild
49-
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_12to15
49+
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_12to15,stage_daos_test_rebuild
5050
5151
"""
5252
self.run_subtest()
@@ -62,9 +62,9 @@ def test_rebuild_16(self):
6262
Core tests for daos_test rebuild
6363
6464
:avocado: tags=all,pr,daily_regression
65-
:avocado: tags=hw,medium
65+
:avocado: tags=cb,medium
6666
:avocado: tags=unittest,rebuild
67-
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_16
67+
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_16,stage_daos_test_rebuild
6868
6969
"""
7070
self.run_subtest()
@@ -80,9 +80,9 @@ def test_rebuild_17(self):
8080
Core tests for daos_test rebuild
8181
8282
:avocado: tags=all,pr,daily_regression
83-
:avocado: tags=hw,medium
83+
:avocado: tags=cb,medium
8484
:avocado: tags=unittest,rebuild
85-
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_17
85+
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_17,stage_daos_test_rebuild
8686
8787
"""
8888
self.run_subtest()
@@ -99,9 +99,9 @@ def test_rebuild_18(self):
9999
Core tests for daos_test rebuild
100100
101101
:avocado: tags=all,pr,daily_regression
102-
:avocado: tags=hw,medium
102+
:avocado: tags=cb,medium
103103
:avocado: tags=unittest,rebuild
104-
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_18
104+
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_18,stage_daos_test_rebuild
105105
106106
107107
"""
@@ -118,9 +118,9 @@ def test_rebuild_19(self):
118118
Core tests for daos_test rebuild
119119
120120
:avocado: tags=all,pr,daily_regression
121-
:avocado: tags=hw,medium
121+
:avocado: tags=cb,medium
122122
:avocado: tags=unittest,rebuild
123-
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_19
123+
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_19,stage_daos_test_rebuild
124124
125125
"""
126126
self.run_subtest()
@@ -136,9 +136,9 @@ def test_rebuild_20(self):
136136
Core tests for daos_test rebuild
137137
138138
:avocado: tags=all,pr,daily_regression
139-
:avocado: tags=hw,medium
139+
:avocado: tags=cb,medium
140140
:avocado: tags=unittest,rebuild
141-
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_20
141+
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_20,stage_daos_test_rebuild
142142
143143
"""
144144
self.run_subtest()
@@ -154,9 +154,9 @@ def test_rebuild_21(self):
154154
Core tests for daos_test rebuild
155155
156156
:avocado: tags=all,pr,daily_regression
157-
:avocado: tags=hw,medium
157+
:avocado: tags=cb,medium
158158
:avocado: tags=unittest,rebuild
159-
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_21
159+
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_21,stage_daos_test_rebuild
160160
161161
"""
162162
self.run_subtest()
@@ -172,9 +172,9 @@ def test_rebuild_22(self):
172172
Core tests for daos_test rebuild
173173
174174
:avocado: tags=all,pr,daily_regression
175-
:avocado: tags=hw,medium
175+
:avocado: tags=cb,medium
176176
:avocado: tags=unittest,rebuild
177-
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_22
177+
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_22,stage_daos_test_rebuild
178178
179179
"""
180180
self.run_subtest()
@@ -190,9 +190,9 @@ def test_rebuild_23(self):
190190
Core tests for daos_test rebuild
191191
192192
:avocado: tags=all,pr,daily_regression
193-
:avocado: tags=hw,medium
193+
:avocado: tags=cb,medium
194194
:avocado: tags=unittest,rebuild
195-
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_23
195+
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_23,stage_daos_test_rebuild
196196
197197
"""
198198
self.run_subtest()
@@ -208,9 +208,9 @@ def test_rebuild_24(self):
208208
Core tests for daos_test rebuild
209209
210210
:avocado: tags=all,pr,daily_regression
211-
:avocado: tags=hw,medium
211+
:avocado: tags=cb,medium
212212
:avocado: tags=unittest,rebuild
213-
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_24
213+
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_24,stage_daos_test_rebuild
214214
215215
"""
216216
self.run_subtest()
@@ -226,9 +226,9 @@ def test_rebuild_25(self):
226226
Core tests for daos_test rebuild
227227
228228
:avocado: tags=all,pr,daily_regression
229-
:avocado: tags=hw,medium
229+
:avocado: tags=cb,medium
230230
:avocado: tags=unittest,rebuild
231-
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_25
231+
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_25,stage_daos_test_rebuild
232232
233233
"""
234234
self.run_subtest()
@@ -244,9 +244,9 @@ def test_rebuild_26(self):
244244
Core tests for daos_test rebuild
245245
246246
:avocado: tags=all,pr,daily_regression
247-
:avocado: tags=hw,medium
247+
:avocado: tags=cb,medium
248248
:avocado: tags=unittest,rebuild
249-
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_26
249+
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_26,stage_daos_test_rebuild
250250
251251
"""
252252
self.run_subtest()
@@ -262,9 +262,9 @@ def test_rebuild_27(self):
262262
Core tests for daos_test rebuild
263263
264264
:avocado: tags=all,pr,daily_regression
265-
:avocado: tags=hw,medium
265+
:avocado: tags=cb,medium
266266
:avocado: tags=unittest,rebuild
267-
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_27
267+
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_27,stage_daos_test_rebuild
268268
269269
"""
270270
self.run_subtest()
@@ -280,9 +280,9 @@ def test_rebuild_28(self):
280280
Core tests for daos_test rebuild
281281
282282
:avocado: tags=all,pr,daily_regression
283-
:avocado: tags=hw,medium
283+
:avocado: tags=cb,medium
284284
:avocado: tags=unittest,rebuild
285-
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_28
285+
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_28,stage_daos_test_rebuild
286286
287287
"""
288288
self.run_subtest()
@@ -298,9 +298,9 @@ def test_rebuild_29(self):
298298
Core tests for daos_test rebuild
299299
300300
:avocado: tags=all,pr,daily_regression
301-
:avocado: tags=hw,medium
301+
:avocado: tags=cb,medium
302302
:avocado: tags=unittest,rebuild
303-
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_29
303+
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_29,stage_daos_test_rebuild
304304
305305
"""
306306
self.run_subtest()
@@ -316,9 +316,9 @@ def test_rebuild_30(self):
316316
Core tests for daos_test rebuild
317317
318318
:avocado: tags=all,pr,daily_regression
319-
:avocado: tags=hw,medium
319+
:avocado: tags=cb,medium
320320
:avocado: tags=unittest,rebuild
321-
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_30
321+
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_30,stage_daos_test_rebuild
322322
323323
"""
324324
self.run_subtest()

0 commit comments

Comments
 (0)