diff --git a/Jenkinsfile b/Jenkinsfile index cfa4963f841..c988b5bea06 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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', default_tags: startedByTimer() ? 'pr daily_regression' : 'pr', nvme: 'auto_md_on_ssd', job_status: job_status_internal, @@ -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', diff --git a/src/tests/ftest/control/daos_server_helper.py b/src/tests/ftest/control/daos_server_helper.py index 5310df70257..0ea52d6146d 100644 --- a/src/tests/ftest/control/daos_server_helper.py +++ b/src/tests/ftest/control/daos_server_helper.py @@ -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 """ diff --git a/src/tests/ftest/control/dmg_telemetry_nvme.py b/src/tests/ftest/control/dmg_telemetry_nvme.py index 376f5130b17..2b3d86982cb 100644 --- a/src/tests/ftest/control/dmg_telemetry_nvme.py +++ b/src/tests/ftest/control/dmg_telemetry_nvme.py @@ -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 """ @@ -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 """ diff --git a/src/tests/ftest/daos_test/rebuild.py b/src/tests/ftest/daos_test/rebuild.py index 48a378d02fe..e123a0fcde7 100644 --- a/src/tests/ftest/daos_test/rebuild.py +++ b/src/tests/ftest/daos_test/rebuild.py @@ -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 """ @@ -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 """ @@ -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 """ @@ -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 """ @@ -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 """ @@ -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 """ @@ -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 """ @@ -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 """ @@ -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 """ @@ -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 """ @@ -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 """ @@ -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 """ @@ -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 """ @@ -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 """ @@ -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 """ @@ -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 """ @@ -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 """ diff --git a/src/tests/ftest/daos_test/suite.py b/src/tests/ftest/daos_test/suite.py index 77ac83217b5..892d9b8ca57 100644 --- a/src/tests/ftest/daos_test/suite.py +++ b/src/tests/ftest/daos_test/suite.py @@ -24,7 +24,7 @@ def test_daos_degraded_mode(self): Core tests for daos_test :avocado: tags=all,pr,daily_regression - :avocado: tags=cb,medium,provider + :avocado: tags=cb,hw,medium,provider :avocado: tags=daos_test,daos_core_test :avocado: tags=DaosCoreTest,test_daos_degraded_mode """ @@ -56,7 +56,7 @@ def test_daos_pool(self): Core tests for daos_test :avocado: tags=all,pr,daily_regression - :avocado: tags=cb,medium,provider + :avocado: tags=cb,hw,medium,provider :avocado: tags=daos_test,daos_core_test :avocado: tags=DaosCoreTest,test_daos_pool """ @@ -72,7 +72,7 @@ def test_daos_container(self): Core tests for daos_test :avocado: tags=all,pr,daily_regression - :avocado: tags=cb,medium,provider + :avocado: tags=cb,hw,medium,provider :avocado: tags=daos_test,daos_core_test :avocado: tags=DaosCoreTest,test_daos_container """ @@ -88,7 +88,7 @@ def test_daos_epoch(self): Core tests for daos_test :avocado: tags=all,pr,daily_regression - :avocado: tags=cb,medium,provider + :avocado: tags=cb,hw,medium,provider :avocado: tags=daos_test,daos_core_test :avocado: tags=DaosCoreTest,test_daos_epoch """ @@ -104,7 +104,7 @@ def test_daos_single_rdg_tx(self): Core tests for daos_test :avocado: tags=all,pr,daily_regression - :avocado: tags=cb,medium,provider + :avocado: tags=cb,hw,medium,provider :avocado: tags=daos_test,daos_core_test :avocado: tags=DaosCoreTest,test_daos_single_rdg_tx """ @@ -120,7 +120,7 @@ def test_daos_distributed_tx(self): Core tests for daos_test :avocado: tags=all,pr,daily_regression - :avocado: tags=cb,medium,provider + :avocado: tags=cb,hw,medium,provider :avocado: tags=daos_test,daos_core_test :avocado: tags=DaosCoreTest,test_daos_distributed_tx """ @@ -136,7 +136,7 @@ def test_daos_verify_consistency(self): Core tests for daos_test :avocado: tags=all,pr,daily_regression - :avocado: tags=cb,medium,provider + :avocado: tags=cb,hw,medium,provider :avocado: tags=daos_test,daos_core_test :avocado: tags=DaosCoreTest,test_daos_verify_consistency """ @@ -152,7 +152,7 @@ def test_daos_io(self): Core tests for daos_test :avocado: tags=all,pr,daily_regression - :avocado: tags=cb,medium,provider + :avocado: tags=cb,hw,medium,provider :avocado: tags=daos_test,daos_core_test :avocado: tags=DaosCoreTest,test_daos_io """ @@ -168,7 +168,7 @@ def test_daos_ec_io(self): Core tests for daos_test :avocado: tags=all,pr,daily_regression - :avocado: tags=cb,medium,provider + :avocado: tags=cb,hw,medium,provider :avocado: tags=daos_test,daos_core_test :avocado: tags=DaosCoreTest,test_daos_ec_io """ @@ -184,7 +184,7 @@ def test_daos_ec_obj(self): Core tests for daos_test :avocado: tags=all,pr,daily_regression - :avocado: tags=cb,medium,provider + :avocado: tags=cb,hw,medium,provider :avocado: tags=daos_test,daos_core_test :avocado: tags=DaosCoreTest,test_daos_ec_obj """ @@ -200,7 +200,7 @@ def test_daos_object_array(self): Core tests for daos_test :avocado: tags=all,pr,daily_regression - :avocado: tags=cb,medium,provider + :avocado: tags=cb,hw,medium,provider :avocado: tags=daos_test,daos_core_test :avocado: tags=DaosCoreTest,test_daos_object_array """ @@ -216,7 +216,7 @@ def test_daos_array(self): Core tests for daos_test :avocado: tags=all,pr,daily_regression - :avocado: tags=cb,medium,provider + :avocado: tags=cb,hw,medium,provider :avocado: tags=daos_test,daos_core_test :avocado: tags=DaosCoreTest,test_daos_array """ @@ -232,7 +232,7 @@ def test_daos_kv(self): Core tests for daos_test :avocado: tags=all,pr,daily_regression - :avocado: tags=cb,medium,provider + :avocado: tags=cb,hw,medium,provider :avocado: tags=daos_test,daos_core_test :avocado: tags=DaosCoreTest,test_daos_kv """ @@ -248,7 +248,7 @@ def test_daos_capability(self): Core tests for daos_test :avocado: tags=all,pr,daily_regression - :avocado: tags=cb,medium,provider + :avocado: tags=cb,hw,medium,provider :avocado: tags=daos_test,daos_core_test :avocado: tags=DaosCoreTest,test_daos_capability """ @@ -264,7 +264,7 @@ def test_daos_epoch_recovery(self): Core tests for daos_test :avocado: tags=all,pr,daily_regression - :avocado: tags=cb,medium,provider + :avocado: tags=cb,hw,medium,provider :avocado: tags=daos_test,daos_core_test :avocado: tags=DaosCoreTest,test_daos_epoch_recovery """ @@ -280,7 +280,7 @@ def test_daos_md_replication(self): Core tests for daos_test :avocado: tags=all,pr,daily_regression - :avocado: tags=cb,medium,provider + :avocado: tags=cb,hw,medium,provider :avocado: tags=daos_test,daos_core_test :avocado: tags=DaosCoreTest,test_daos_md_replication """ @@ -312,7 +312,7 @@ def test_daos_drain_simple(self): Core tests for daos_test :avocado: tags=all,pr,daily_regression - :avocado: tags=cb,medium,provider + :avocado: tags=cb,hw,medium,provider :avocado: tags=daos_test,daos_core_test,rebuild :avocado: tags=DaosCoreTest,test_daos_drain_simple """ @@ -344,7 +344,7 @@ def test_daos_rebuild_interactive(self): Core tests for daos_test :avocado: tags=all,pr,daily_regression - :avocado: tags=cb,medium,provider + :avocado: tags=cb,hw,medium,provider :avocado: tags=daos_test,daos_core_test,rebuild :avocado: tags=DaosCoreTest,test_daos_rebuild_interactive """ @@ -360,7 +360,7 @@ def test_daos_oid_allocator(self): Core tests for daos_test :avocado: tags=all,pr,daily_regression - :avocado: tags=cb,medium,provider + :avocado: tags=cb,hw,medium,provider :avocado: tags=daos_test,daos_core_test :avocado: tags=DaosCoreTest,test_daos_oid_allocator """ @@ -376,7 +376,7 @@ def test_daos_checksum(self): Core tests for daos_test :avocado: tags=all,pr,daily_regression - :avocado: tags=cb,medium,provider + :avocado: tags=cb,hw,medium,provider :avocado: tags=daos_test,daos_core_test :avocado: tags=DaosCoreTest,test_daos_checksum """ @@ -408,7 +408,7 @@ def test_daos_aggregate_ec(self): Core tests for daos_test :avocado: tags=all,pr,daily_regression - :avocado: tags=cb,medium,provider + :avocado: tags=cb,hw,medium,provider :avocado: tags=daos_test,daos_core_test :avocado: tags=DaosCoreTest,test_daos_aggregate_ec """ @@ -424,7 +424,7 @@ def test_daos_degraded_ec(self): Core tests for daos_test :avocado: tags=all,pr,daily_regression - :avocado: tags=cb,medium,provider + :avocado: tags=cb,hw,medium,provider :avocado: tags=daos_test,daos_core_test :avocado: tags=DaosCoreTest,test_daos_degraded_ec """ @@ -440,7 +440,7 @@ def test_daos_dedup(self): Core tests for daos_test :avocado: tags=all,pr,daily_regression - :avocado: tags=cb,medium,provider + :avocado: tags=cb,hw,medium,provider :avocado: tags=daos_test,daos_core_test :avocado: tags=DaosCoreTest,test_daos_dedup """ @@ -456,7 +456,7 @@ def test_daos_upgrade(self): Core tests for daos_test :avocado: tags=all,pr,daily_regression - :avocado: tags=cb,medium,provider + :avocado: tags=cb,hw,medium,provider :avocado: tags=daos_test,daos_core_test :avocado: tags=DaosCoreTest,test_daos_upgrade """ @@ -472,7 +472,7 @@ def test_daos_pipeline(self): Core tests for daos_test :avocado: tags=all,pr,daily_regression - :avocado: tags=cb,medium,provider + :avocado: tags=cb,hw,medium,provider :avocado: tags=daos_test,daos_core_test,faults :avocado: tags=DaosCoreTest,test_daos_pipeline """ diff --git a/src/tests/ftest/harness/core_files.py b/src/tests/ftest/harness/core_files.py index 9abb2f2b220..38c08d7bf0e 100644 --- a/src/tests/ftest/harness/core_files.py +++ b/src/tests/ftest/harness/core_files.py @@ -98,7 +98,7 @@ def test_core_files_hw(self): in launch.py to be tested. :avocado: tags=all - :avocado: tags=hw,cb,medium,large + :avocado: tags=hw,cb,hw,medium,large :avocado: tags=harness,core_files :avocado: tags=HarnessCoreFilesTest,test_core_files_hw """ diff --git a/src/tests/ftest/harness/setup.py b/src/tests/ftest/harness/setup.py index aba050263f4..cdaaf8157f7 100644 --- a/src/tests/ftest/harness/setup.py +++ b/src/tests/ftest/harness/setup.py @@ -19,7 +19,7 @@ def test_setup(self): Useful for setting up the /etc/daos/daos_server.yml files on multiple hosts. :avocado: tags=all - :avocado: tags=hw,cb,medium,large + :avocado: tags=hw,cb,hw,medium,large :avocado: tags=harness :avocado: tags=HarnessSetupTest,test_setup """ diff --git a/src/tests/ftest/osa/online_parallel_test.py b/src/tests/ftest/osa/online_parallel_test.py index 72debd97543..194fecca166 100644 --- a/src/tests/ftest/osa/online_parallel_test.py +++ b/src/tests/ftest/osa/online_parallel_test.py @@ -193,7 +193,7 @@ def test_osa_online_parallel_test(self): Test Description: Runs multiple OSA commands/IO in parallel :avocado: tags=all,pr,daily_regression - :avocado: tags=cb,medium + :avocado: tags=cb,hw,medium :avocado: tags=osa,checksum,osa_parallel :avocado: tags=OSAOnlineParallelTest,test_osa_online_parallel_test """ diff --git a/src/tests/ftest/pool/create_query.py b/src/tests/ftest/pool/create_query.py index 9ea6d6dadee..1cb1711cc76 100644 --- a/src/tests/ftest/pool/create_query.py +++ b/src/tests/ftest/pool/create_query.py @@ -32,7 +32,7 @@ def test_create_and_query(self): pool create. :avocado: tags=all,pr,daily_regression - :avocado: tags=cb,medium + :avocado: tags=cb,hw,medium :avocado: tags=pool :avocado: tags=PoolCreateQueryTests,test_create_and_query """ diff --git a/src/tests/ftest/rebuild/pool_destroy_race.py b/src/tests/ftest/rebuild/pool_destroy_race.py index a3bc335d0a9..1b267140c2f 100644 --- a/src/tests/ftest/rebuild/pool_destroy_race.py +++ b/src/tests/ftest/rebuild/pool_destroy_race.py @@ -35,7 +35,7 @@ def test_pool_destroy_with_io(self): Re-create pool on remaining ranks. :avocado: tags=all,pr - :avocado: tags=cb,medium + :avocado: tags=cb,hw,medium :avocado: tags=pool,rebuild,ior :avocado: tags=RbldPoolDestroyWithIO,test_pool_destroy_with_io """ diff --git a/src/tests/ftest/server/storage_tiers.py b/src/tests/ftest/server/storage_tiers.py index 70e5800d1c9..99e277904dd 100644 --- a/src/tests/ftest/server/storage_tiers.py +++ b/src/tests/ftest/server/storage_tiers.py @@ -29,7 +29,7 @@ def test_tiers(self): Does not test or rely on actual hardware being present. :avocado: tags=all,pr - :avocado: tags=cb,medium + :avocado: tags=cb,hw,medium :avocado: tags=server,storage,storage_tiers :avocado: tags=StorageTiers,test_tiers """