Merge pull request #12056 from petr-balogh/copose_rdr_ui_marker

petr-balogh · web-flow · commit 8ac5d648f907 · 2025-05-07T08:35:27.000+02:00
Compose rdr_ui marker with skipif
diff --git a/ocs_ci/framework/pytest_customization/marks.py b/ocs_ci/framework/pytest_customization/marks.py
@@ -588,11 +588,12 @@
     reason="Metrics is not enabled for external mode OCS <4.6",
 )
 
-rdr_ui = pytest.mark.skipif(
+rdr_ui_skipif = pytest.mark.skipif(
     not config.RUN.get("rdr_failover_via_ui")
     or not config.RUN.get("rdr_relocate_via_ui"),
     reason="RDR UI failover or relocate config needed",
 )
+rdr_ui = compose(rdr_ui_skipif, pytest.mark.rdr_ui)
 
 dr_hub_recovery = pytest.mark.skipif(
     config.nclusters != 4,

Original file line number	Diff line number	Diff line change
`@@ -588,11 +588,12 @@`
`588`	`588`	`reason="Metrics is not enabled for external mode OCS <4.6",`
`589`	`589`	`)`
`590`	`590`
`591`		`-rdr_ui = pytest.mark.skipif(`
	`591`	`+rdr_ui_skipif = pytest.mark.skipif(`
`592`	`592`	`not config.RUN.get("rdr_failover_via_ui")`
`593`	`593`	`or not config.RUN.get("rdr_relocate_via_ui"),`
`594`	`594`	`reason="RDR UI failover or relocate config needed",`
`595`	`595`	`)`
	`596`	`+rdr_ui = compose(rdr_ui_skipif, pytest.mark.rdr_ui)`
`596`	`597`
`597`	`598`	`dr_hub_recovery = pytest.mark.skipif(`
`598`	`599`	`config.nclusters != 4,`