Skip to content

Commit 25f4335

Browse files
ryon-jensenryon-jensen
committed
Based on feedback from CI WG, changed the test tagging to be more generic (01, 02, 03)
Signed-off-by: Ryon Jensen <ryon.jensen@hpe.com> Build-description: Targeting hdr-233 Skip-func-test-cb-md-on-ssd-daos-test: true Skip-func-test-cb-md-on-ssd-ftest: false Cancel-prev-build: false Skip-unit-test: true Skip-unit-test-memcheck: true Skip-nlt: true Skip-fault-injection-test: true Skip-test-el-9-rpms: true Skip-test-leap-15-rpms: true Skip-func-test-el8: true Skip-func-test-el9: true Skip-func-test-leap15: true Skip-func-test-hw-medium: true Skip-func-test-hw-medium-md-on-ssd: true Skip-func-test-hw-medium-vmd: true Skip-func-test-hw-medium-verbs-provider: true Skip-func-test-hw-medium-verbs-provider-md-on-ssd: true Skip-func-test-hw-large: true Skip-func-test-hw-large-md-on-ssd: true Skip-python-bandit-check: true
1 parent fbc1288 commit 25f4335

10 files changed

Lines changed: 88 additions & 88 deletions

File tree

‎Jenkinsfile‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -345,15 +345,15 @@ pipeline {
345345
booleanParam(name: 'CI_large_md_on_ssd_TEST',
346346
defaultValue: true,
347347
description: 'Run the Functional Hardware Large MD on SSD test stage')
348-
booleanParam(name: 'CI_md_on_ssd_daos_test_TEST',
348+
booleanParam(name: 'CI_cb_md_on_ssd_01_TEST',
349349
defaultValue: true,
350-
description: 'Run the Functional Cluster Box daos_test Other test stage')
351-
booleanParam(name: 'CI_md_on_ssd_ftest_TEST',
350+
description: 'Run the Functional Cluster Box test stage 01')
351+
booleanParam(name: 'CI_cb_md_on_ssd_02_TEST',
352352
defaultValue: true,
353-
description: 'Run the Functional Cluster Box FTest test stage')
354-
booleanParam(name: 'CI_md_on_ssd_daos_test_rebuild_TEST',
353+
description: 'Run the Functional Cluster Box test stage 02')
354+
booleanParam(name: 'CI_cb_md_on_ssd_03_TEST',
355355
defaultValue: true,
356-
description: 'Run the Functional Cluster Box daos_test_rebuild test stage')
356+
description: 'Run the Functional Cluster Box test stage 03')
357357
string(name: 'CI_UNIT_VM1_LABEL',
358358
defaultValue: 'ci_vm1',
359359
description: 'Label to use for 1 VM node unit and RPM tests')
@@ -1196,37 +1196,37 @@ pipeline {
11961196
image_version: 'el9.7',
11971197
node_count: 5
11981198
)
1199-
hwStages['Functional Hardware Large'] = getFunctionalTestStage(
1200-
name: 'Functional Hardware Large',
1201-
pragma_suffix: '-hw-large',
1202-
label: params.FUNCTIONAL_HARDWARE_LARGE_LABEL,
1203-
next_version: next_version(),
1204-
stage_tags: 'hw,large',
1205-
default_tags: startedByTimer() ? 'pr daily_regression' : 'pr',
1206-
default_nvme: 'auto',
1207-
run_if_pr: false,
1208-
run_if_landing: false,
1209-
job_status: job_status_internal,
1210-
image_version: 'el9.7'
1211-
)
1212-
hwStages['Functional Hardware Large MD on SSD'] = getFunctionalTestStage(
1213-
name: 'Functional Hardware Large MD on SSD',
1214-
pragma_suffix: '-hw-large-md-on-ssd',
1215-
label: params.FUNCTIONAL_HARDWARE_LARGE_LABEL,
1216-
next_version: next_version(),
1217-
stage_tags: 'hw,large',
1218-
default_tags: startedByTimer() ? 'pr daily_regression' : 'pr',
1219-
default_nvme: 'auto_md_on_ssd',
1220-
run_if_pr: true,
1221-
run_if_landing: false,
1222-
job_status: job_status_internal,
1223-
image_version: 'el9.7'
1224-
)
1199+
hwStages['Functional Hardware Large'] = getFunctionalTestStage(
1200+
name: 'Functional Hardware Large',
1201+
pragma_suffix: '-hw-large',
1202+
label: params.FUNCTIONAL_HARDWARE_LARGE_LABEL,
1203+
next_version: next_version(),
1204+
stage_tags: 'hw,large',
1205+
default_tags: startedByTimer() ? 'pr daily_regression' : 'pr',
1206+
default_nvme: 'auto',
1207+
run_if_pr: false,
1208+
run_if_landing: false,
1209+
job_status: job_status_internal,
1210+
image_version: 'el9.7'
1211+
)
1212+
hwStages['Functional Hardware Large MD on SSD'] = getFunctionalTestStage(
1213+
name: 'Functional Hardware Large MD on SSD',
1214+
pragma_suffix: '-hw-large-md-on-ssd',
1215+
label: params.FUNCTIONAL_HARDWARE_LARGE_LABEL,
1216+
next_version: next_version(),
1217+
stage_tags: 'hw,large',
1218+
default_tags: startedByTimer() ? 'pr daily_regression' : 'pr',
1219+
default_nvme: 'auto_md_on_ssd',
1220+
run_if_pr: true,
1221+
run_if_landing: false,
1222+
job_status: job_status_internal,
1223+
image_version: 'el9.7'
1224+
)
12251225

12261226
List<Map> clusterBoxStages = [
1227-
[name: 'daos_test Rebuild', tag: 'stage_daos_test_rebuild', pragma_suffix: '-cb-md-on-ssd-rebuild'],
1228-
[name: 'daos_test Other', tag: 'stage_daos_test', pragma_suffix: '-cb-md-on-ssd-daos-test'],
1229-
[name: 'FTest', tag: 'stage_ftest', pragma_suffix: '-cb-md-on-ssd-ftest'],
1227+
[name: '01', tag: 'cb_01', pragma_suffix: '-cb-md-on-ssd-cb-01'],
1228+
[name: '02', tag: 'cb_02', pragma_suffix: '-cb-md-on-ssd-cb-02'],
1229+
[name: '03', tag: 'cb_03', pragma_suffix: '-cb-md-on-ssd-cb-03'],
12301230
]
12311231

12321232
clusterBoxStages.each { cfg ->
@@ -1236,7 +1236,7 @@ pipeline {
12361236
pragma_suffix: cfg.pragma_suffix,
12371237
label: params.FUNCTIONAL_CLUSTER_BOX_LABEL,
12381238
next_version: next_version(),
1239-
stage_tags: "cb,medium,${cfg.tag}",
1239+
stage_tags: "medium,${cfg.tag}",
12401240
default_tags: startedByTimer() ? 'pr daily_regression' : 'pr',
12411241
nvme: 'auto_md_on_ssd',
12421242
image_version: 'el9.7',

‎src/tests/ftest/control/daos_server_helper.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def test_daos_server_helper_format(self):
3232
operations while daos_server is run as normal user.
3333
3434
:avocado: tags=all,pr,daily_regression
35-
:avocado: tags=cb,medium,stage_ftest
35+
:avocado: tags=medium,cb_03
3636
:avocado: tags=control,basic,daos_server_helper
3737
:avocado: tags=DaosPrivHelperTest,test_daos_server_helper_format
3838
"""

‎src/tests/ftest/control/dmg_telemetry_nvme.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def test_nvme_telemetry_metrics(self):
3232
Verify the telemetry engine NVMe metrics.
3333
3434
:avocado: tags=all,pr,daily_regression
35-
:avocado: tags=cb,medium,stage_ftest
35+
:avocado: tags=medium,cb_03
3636
:avocado: tags=control,telemetry,nvme
3737
:avocado: tags=TestWithTelemetryNvme,test_nvme_telemetry_metrics
3838
"""
@@ -68,7 +68,7 @@ def test_telemetry_list_nvme(self):
6868
Verify the dmg telemetry list command.
6969
7070
:avocado: tags=all,pr,daily_regression
71-
:avocado: tags=cb,medium,stage_ftest
71+
:avocado: tags=medium,cb_03
7272
:avocado: tags=control,telemetry,nvme
7373
:avocado: tags=TestWithTelemetryNvme,test_telemetry_list_nvme
7474
"""

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def test_rebuild_0to10(self):
2525
Core tests for daos_test rebuild
2626
2727
:avocado: tags=all,pr,daily_regression
28-
:avocado: tags=cb,medium,stage_daos_test_rebuild
28+
:avocado: tags=medium,cb_01
2929
:avocado: tags=unittest,rebuild
3030
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_0to10
3131
"""
@@ -41,7 +41,7 @@ def test_rebuild_12to15(self):
4141
Core tests for daos_test rebuild
4242
4343
:avocado: tags=all,pr,daily_regression
44-
:avocado: tags=cb,2,medium,stage_daos_test_rebuild
44+
:avocado: tags=2,medium,cb_01
4545
:avocado: tags=unittest,rebuild
4646
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_12to15
4747
"""
@@ -57,7 +57,7 @@ def test_rebuild_16(self):
5757
Core tests for daos_test rebuild
5858
5959
:avocado: tags=all,pr,daily_regression
60-
:avocado: tags=cb,medium,stage_daos_test_rebuild
60+
:avocado: tags=medium,cb_01
6161
:avocado: tags=unittest,rebuild
6262
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_16
6363
"""
@@ -73,7 +73,7 @@ def test_rebuild_17(self):
7373
Core tests for daos_test rebuild
7474
7575
:avocado: tags=all,pr,daily_regression
76-
:avocado: tags=cb,medium,stage_daos_test_rebuild
76+
:avocado: tags=medium,cb_01
7777
:avocado: tags=unittest,rebuild
7878
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_17
7979
"""
@@ -89,7 +89,7 @@ def test_rebuild_18(self):
8989
Core tests for daos_test rebuild
9090
9191
:avocado: tags=all,pr,daily_regression
92-
:avocado: tags=cb,medium,stage_daos_test_rebuild
92+
:avocado: tags=medium,cb_01
9393
:avocado: tags=unittest,rebuild
9494
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_18
9595
"""
@@ -105,7 +105,7 @@ def test_rebuild_19(self):
105105
Core tests for daos_test rebuild
106106
107107
:avocado: tags=all,pr,daily_regression
108-
:avocado: tags=cb,medium,stage_daos_test_rebuild
108+
:avocado: tags=medium,cb_01
109109
:avocado: tags=unittest,rebuild
110110
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_19
111111
"""
@@ -121,7 +121,7 @@ def test_rebuild_20(self):
121121
Core tests for daos_test rebuild
122122
123123
:avocado: tags=all,pr,daily_regression
124-
:avocado: tags=cb,medium,stage_daos_test_rebuild
124+
:avocado: tags=medium,cb_01
125125
:avocado: tags=unittest,rebuild
126126
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_20
127127
"""
@@ -137,7 +137,7 @@ def test_rebuild_21(self):
137137
Core tests for daos_test rebuild
138138
139139
:avocado: tags=all,pr,daily_regression
140-
:avocado: tags=cb,medium,stage_daos_test_rebuild
140+
:avocado: tags=medium,cb_01
141141
:avocado: tags=unittest,rebuild
142142
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_21
143143
"""
@@ -153,7 +153,7 @@ def test_rebuild_22(self):
153153
Core tests for daos_test rebuild
154154
155155
:avocado: tags=all,pr,daily_regression
156-
:avocado: tags=cb,medium,stage_daos_test_rebuild
156+
:avocado: tags=medium,cb_01
157157
:avocado: tags=unittest,rebuild
158158
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_22
159159
"""
@@ -169,7 +169,7 @@ def test_rebuild_23(self):
169169
Core tests for daos_test rebuild
170170
171171
:avocado: tags=all,pr,daily_regression
172-
:avocado: tags=cb,medium,stage_daos_test_rebuild
172+
:avocado: tags=medium,cb_01
173173
:avocado: tags=unittest,rebuild
174174
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_23
175175
"""
@@ -185,7 +185,7 @@ def test_rebuild_24(self):
185185
Core tests for daos_test rebuild
186186
187187
:avocado: tags=all,pr,daily_regression
188-
:avocado: tags=cb,medium,stage_daos_test_rebuild
188+
:avocado: tags=medium,cb_01
189189
:avocado: tags=unittest,rebuild
190190
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_24
191191
"""
@@ -201,7 +201,7 @@ def test_rebuild_25(self):
201201
Core tests for daos_test rebuild
202202
203203
:avocado: tags=all,pr,daily_regression
204-
:avocado: tags=cb,medium,stage_daos_test_rebuild
204+
:avocado: tags=medium,cb_01
205205
:avocado: tags=unittest,rebuild
206206
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_25
207207
"""
@@ -217,7 +217,7 @@ def test_rebuild_26(self):
217217
Core tests for daos_test rebuild
218218
219219
:avocado: tags=all,pr,daily_regression
220-
:avocado: tags=cb,medium,stage_daos_test_rebuild
220+
:avocado: tags=medium,cb_01
221221
:avocado: tags=unittest,rebuild
222222
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_26
223223
"""
@@ -233,7 +233,7 @@ def test_rebuild_27(self):
233233
Core tests for daos_test rebuild
234234
235235
:avocado: tags=all,pr,daily_regression
236-
:avocado: tags=cb,medium,stage_daos_test_rebuild
236+
:avocado: tags=medium,cb_01
237237
:avocado: tags=unittest,rebuild
238238
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_27
239239
@@ -250,7 +250,7 @@ def test_rebuild_28(self):
250250
Core tests for daos_test rebuild
251251
252252
:avocado: tags=all,pr,daily_regression
253-
:avocado: tags=cb,medium,stage_daos_test_rebuild
253+
:avocado: tags=medium,cb_01
254254
:avocado: tags=unittest,rebuild
255255
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_28
256256
"""
@@ -266,7 +266,7 @@ def test_rebuild_29(self):
266266
Core tests for daos_test rebuild
267267
268268
:avocado: tags=all,pr,daily_regression
269-
:avocado: tags=cb,medium,stage_daos_test_rebuild
269+
:avocado: tags=medium,cb_01
270270
:avocado: tags=unittest,rebuild
271271
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_29
272272
"""
@@ -282,7 +282,7 @@ def test_rebuild_30(self):
282282
Core tests for daos_test rebuild
283283
284284
:avocado: tags=all,pr,daily_regression
285-
:avocado: tags=cb,medium,stage_daos_test_rebuild
285+
:avocado: tags=medium,cb_01
286286
:avocado: tags=unittest,rebuild
287287
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_30
288288
"""

0 commit comments

Comments
 (0)