Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -1280,7 +1280,7 @@ pipeline {
pragma_suffix: '-hw-medium-md-on-ssd',
label: params.FUNCTIONAL_HARDWARE_MEDIUM_LABEL,
next_version: next_version(),
stage_tags: 'hw,medium,-provider',
stage_tags: 'hw,medium,-provider,-cb',

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

How would someone run a test tagged with both cb and hw in a HW stage?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

They would have to modify a line like this one. If we wanted to be able to control the behavior through commit pragmas, we could make the inclusion of ,-cb optional with something like:

Suggested change
stage_tags: 'hw,medium,-provider,-cb',
stage_tags: 'hw,medium,-provider' +
(cachedCommitPragma(pragma: 'Func-hw-exclude-cb-tests', def_val: 'true').toLowerCase() == 'true' ? ',-cb' : ''),

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

The reason for this change is we don't have Cluster Box stages in daily/weekly pipelines - including situations where we run the tests with different providers, so to avoid not running those tests they need to support being run in both CB and HW stages.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Why don't we add Cluster Box stages to daily/weekly? I think having it be different in PRs vs daily/weekly means we might have failures in one but not the other and trying to fix them might be confusing

@phender phender Aug 7, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We would have to add 4-5 stages (note: Functional Cluster Box Medium MD on SSD already exists):

  • daily-testing

    • Functional Cluster Box Medium
    • Functional Cluster Box Medium Verbs Provider
    • Functional Cluster Box Medium Verbs Provider MD on SSD
    • Functional Cluster Box Medium UCX Provider
    • Functional Cluster Box Medium VMD (potentially if more cb tests added)

    I see an advantage to having a daily run of a cb tagged test on HW. One that can be used to compare if failures are seen on CB or HW and not vice-versa.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This is also needed on the other Functional Hardware Medium * stages:

  • Functional Hardware Medium
  • Functional Hardware Medium VMD
  • Functional Hardware Medium UCX Provider

default_tags: startedByTimer() ? 'pr daily_regression' : 'pr',
nvme: 'auto_md_on_ssd',
job_status: job_status_internal,
Expand Down Expand Up @@ -1318,7 +1318,7 @@ pipeline {
pragma_suffix: '-hw-medium-verbs-provider-md-on-ssd',
label: params.FUNCTIONAL_HARDWARE_MEDIUM_VERBS_PROVIDER_LABEL,
next_version: next_version(),
stage_tags: 'hw,medium,provider',
stage_tags: 'hw,medium,provider,-cb',
default_tags: startedByTimer() ? 'pr daily_regression' : 'pr',
default_nvme: 'auto_md_on_ssd',
provider: 'ofi+verbs;ofi_rxm',
Expand Down
2 changes: 1 addition & 1 deletion src/tests/ftest/control/daos_server_helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def test_daos_server_helper_format(self):
operations while daos_server is run as normal user.

:avocado: tags=all,pr,daily_regression
:avocado: tags=cb,medium
:avocado: tags=cb,hw,medium
:avocado: tags=control,basic,daos_server_helper
:avocado: tags=DaosPrivHelperTest,test_daos_server_helper_format
"""
Expand Down
4 changes: 2 additions & 2 deletions src/tests/ftest/control/dmg_telemetry_nvme.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def test_nvme_telemetry_metrics(self):
Verify the telemetry engine NVMe metrics.

:avocado: tags=all,pr,daily_regression
:avocado: tags=cb,medium
:avocado: tags=cb,hw,medium
:avocado: tags=control,telemetry,nvme
:avocado: tags=TestWithTelemetryNvme,test_nvme_telemetry_metrics
"""
Expand Down Expand Up @@ -69,7 +69,7 @@ def test_telemetry_list_nvme(self):
Verify the dmg telemetry list command.

:avocado: tags=all,pr,daily_regression
:avocado: tags=cb,medium
:avocado: tags=cb,hw,medium
:avocado: tags=control,telemetry,nvme
:avocado: tags=TestWithTelemetryNvme,test_telemetry_list_nvme
"""
Expand Down
34 changes: 17 additions & 17 deletions src/tests/ftest/daos_test/rebuild.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def test_rebuild_0to10(self):
Core tests for daos_test rebuild

:avocado: tags=all,pr,daily_regression
:avocado: tags=cb,medium
:avocado: tags=cb,hw,medium
:avocado: tags=unittest,rebuild
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_0to10
"""
Expand All @@ -41,7 +41,7 @@ def test_rebuild_12to15(self):
Core tests for daos_test rebuild

:avocado: tags=all,pr,daily_regression
:avocado: tags=cb,2,medium
:avocado: tags=cb,hw,medium
:avocado: tags=unittest,rebuild
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_12to15
"""
Expand All @@ -57,7 +57,7 @@ def test_rebuild_16(self):
Core tests for daos_test rebuild

:avocado: tags=all,pr,daily_regression
:avocado: tags=cb,medium
:avocado: tags=cb,hw,medium
:avocado: tags=unittest,rebuild
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_16
"""
Expand All @@ -73,7 +73,7 @@ def test_rebuild_17(self):
Core tests for daos_test rebuild

:avocado: tags=all,pr,daily_regression
:avocado: tags=cb,medium
:avocado: tags=cb,hw,medium
:avocado: tags=unittest,rebuild
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_17
"""
Expand All @@ -89,7 +89,7 @@ def test_rebuild_18(self):
Core tests for daos_test rebuild

:avocado: tags=all,pr,daily_regression
:avocado: tags=cb,medium
:avocado: tags=cb,hw,medium
:avocado: tags=unittest,rebuild
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_18
"""
Expand All @@ -105,7 +105,7 @@ def test_rebuild_19(self):
Core tests for daos_test rebuild

:avocado: tags=all,pr,daily_regression
:avocado: tags=cb,medium
:avocado: tags=cb,hw,medium
:avocado: tags=unittest,rebuild
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_19
"""
Expand All @@ -121,7 +121,7 @@ def test_rebuild_20(self):
Core tests for daos_test rebuild

:avocado: tags=all,pr,daily_regression
:avocado: tags=cb,medium
:avocado: tags=cb,hw,medium
:avocado: tags=unittest,rebuild
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_20
"""
Expand All @@ -137,7 +137,7 @@ def test_rebuild_21(self):
Core tests for daos_test rebuild

:avocado: tags=all,pr,daily_regression
:avocado: tags=cb,medium
:avocado: tags=cb,hw,medium
:avocado: tags=unittest,rebuild
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_21
"""
Expand All @@ -153,7 +153,7 @@ def test_rebuild_22(self):
Core tests for daos_test rebuild

:avocado: tags=all,pr,daily_regression
:avocado: tags=cb,medium
:avocado: tags=cb,hw,medium
:avocado: tags=unittest,rebuild
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_22
"""
Expand All @@ -169,7 +169,7 @@ def test_rebuild_23(self):
Core tests for daos_test rebuild

:avocado: tags=all,pr,daily_regression
:avocado: tags=cb,medium
:avocado: tags=cb,hw,medium
:avocado: tags=unittest,rebuild
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_23
"""
Expand All @@ -185,7 +185,7 @@ def test_rebuild_24(self):
Core tests for daos_test rebuild

:avocado: tags=all,pr,daily_regression
:avocado: tags=cb,medium
:avocado: tags=cb,hw,medium
:avocado: tags=unittest,rebuild
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_24
"""
Expand All @@ -201,7 +201,7 @@ def test_rebuild_25(self):
Core tests for daos_test rebuild

:avocado: tags=all,pr,daily_regression
:avocado: tags=cb,medium
:avocado: tags=cb,hw,medium
:avocado: tags=unittest,rebuild
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_25
"""
Expand All @@ -217,7 +217,7 @@ def test_rebuild_26(self):
Core tests for daos_test rebuild

:avocado: tags=all,pr,daily_regression
:avocado: tags=cb,medium
:avocado: tags=cb,hw,medium
:avocado: tags=unittest,rebuild
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_26
"""
Expand All @@ -233,7 +233,7 @@ def test_rebuild_27(self):
Core tests for daos_test rebuild

:avocado: tags=all,pr,daily_regression
:avocado: tags=cb,medium
:avocado: tags=cb,hw,medium
:avocado: tags=unittest,rebuild
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_27
"""
Expand All @@ -249,7 +249,7 @@ def test_rebuild_28(self):
Core tests for daos_test rebuild

:avocado: tags=all,pr,daily_regression
:avocado: tags=cb,medium
:avocado: tags=cb,hw,medium
:avocado: tags=unittest,rebuild
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_28
"""
Expand All @@ -265,7 +265,7 @@ def test_rebuild_29(self):
Core tests for daos_test rebuild

:avocado: tags=all,pr,daily_regression
:avocado: tags=cb,medium
:avocado: tags=cb,hw,medium
:avocado: tags=unittest,rebuild
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_29
"""
Expand All @@ -281,7 +281,7 @@ def test_rebuild_30(self):
Core tests for daos_test rebuild

:avocado: tags=all,pr,daily_regression
:avocado: tags=cb,medium
:avocado: tags=cb,hw,medium
:avocado: tags=unittest,rebuild
:avocado: tags=DaosCoreTestRebuild,daos_test,daos_core_test_rebuild,test_rebuild_30
"""
Expand Down
Loading
Loading