Skip to content

Commit c9912e0

Browse files
authored
[IUO] add jira cnv-70251 (RedHatQE#2263)
Signed-off-by: Harel Meir <hmeir@redhat.com>
1 parent 106c880 commit c9912e0

File tree

1 file changed

+15
-2
lines changed

1 file changed

+15
-2
lines changed

tests/install_upgrade_operators/conftest.py

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,13 @@
2121
get_resource_by_name,
2222
get_resource_from_module_name,
2323
)
24-
from utilities.constants import HPP_POOL
24+
from utilities.constants import HCO_BEARER_AUTH, HPP_POOL
2525
from utilities.hco import ResourceEditorValidateHCOReconcile, get_hco_version
2626
from utilities.infra import (
2727
get_daemonset_by_name,
2828
get_deployment_by_name,
2929
get_pod_by_name_prefix,
30+
is_jira_open,
3031
)
3132
from utilities.operator import (
3233
disable_default_sources_in_operatorhub,
@@ -204,10 +205,17 @@ def ocp_resource_by_name(admin_client, ocp_resources_submodule_list, related_obj
204205

205206

206207
@pytest.fixture()
207-
def related_object_from_hco_status(hco_status_related_objects, cnv_related_object_matrix__function__):
208+
def related_object_from_hco_status(
209+
is_jira_70251_open,
210+
hco_status_related_objects,
211+
cnv_related_object_matrix__function__,
212+
):
208213
LOGGER.info(cnv_related_object_matrix__function__)
209214
kind_name = list(cnv_related_object_matrix__function__.values())[0]
210215
related_object_name = list(cnv_related_object_matrix__function__.keys())[0]
216+
217+
if related_object_name == HCO_BEARER_AUTH and is_jira_70251_open:
218+
pytest.xfail(f"Skipping related object {related_object_name}, kind {kind_name} because of CNV-70251")
211219
LOGGER.info(f"Looking for related object {related_object_name}, kind {kind_name}")
212220
for obj in hco_status_related_objects:
213221
if obj.name == related_object_name and obj.kind == kind_name:
@@ -235,3 +243,8 @@ def updated_resource(
235243
wait_for_reconcile_post_update=True,
236244
):
237245
yield cr
246+
247+
248+
@pytest.fixture(scope="session")
249+
def is_jira_70251_open():
250+
return is_jira_open(jira_id="CNV-70251")

0 commit comments

Comments
 (0)