Merge pull request #12088 from openshift-cherrypick-robot/cherry-pick-12056-to-master

petr-balogh · web-flow · commit 4753482853fa · 2025-05-07T10:19:51.000+02:00
[master] Compose rdr_ui marker with skipif
diff --git a/ocs_ci/framework/pytest_customization/marks.py b/ocs_ci/framework/pytest_customization/marks.py
@@ -608,11 +608,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
`@@ -608,11 +608,12 @@`
`608`	`608`	`reason="Metrics is not enabled for external mode OCS <4.6",`
`609`	`609`	`)`
`610`	`610`
`611`		`-rdr_ui = pytest.mark.skipif(`
	`611`	`+rdr_ui_skipif = pytest.mark.skipif(`
`612`	`612`	`not config.RUN.get("rdr_failover_via_ui")`
`613`	`613`	`or not config.RUN.get("rdr_relocate_via_ui"),`
`614`	`614`	`reason="RDR UI failover or relocate config needed",`
`615`	`615`	`)`
	`616`	`+rdr_ui = compose(rdr_ui_skipif, pytest.mark.rdr_ui)`
`616`	`617`
`617`	`618`	`dr_hub_recovery = pytest.mark.skipif(`
`618`	`619`	`config.nclusters != 4,`