Skip to content

Commit

Permalink
Added marker to skip test running on cluster deployed with ext pgsql (#…
Browse files Browse the repository at this point in the history
…9725)

Signed-off-by: tiffanyn108 <[email protected]>
  • Loading branch information
tiffanyn108 authored May 17, 2024
1 parent 4dbb87e commit bb6b14d
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 0 deletions.
4 changes: 4 additions & 0 deletions ocs_ci/framework/pytest_customization/marks.py
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,10 @@
reason="This test doesn't work correctly on OCP cluster deployed via Flexy",
)

skipif_noobaa_external_pgsql = pytest.mark.skipif(
config.ENV_DATA.get("noobaa_external_pgsql") is True,
reason="This test will not run correctly in external DB deployed cluster.",
)
metrics_for_external_mode_required = pytest.mark.skipif(
version.get_semantic_ocs_version_from_config() < version.VERSION_4_6
and config.DEPLOYMENT.get("external_mode") is True,
Expand Down
2 changes: 2 additions & 0 deletions tests/functional/object/mcg/test_bucket_replication.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
red_squad,
mcg,
sts_deployment_required,
skipif_noobaa_external_pgsql,
)
from ocs_ci.ocs.exceptions import CommandFailed
from ocs_ci.framework.testlib import MCGTest
Expand Down Expand Up @@ -360,6 +361,7 @@ def test_bidirectional_bucket_replication(
mcg_obj_session, first_bucket_name, second_bucket_name, timeout=self.TIMEOUT
), f"Objects in the buckets {first_bucket_name} and {second_bucket_name} are not same"

@skipif_noobaa_external_pgsql
@pytest.mark.parametrize(
argnames=["source_bucketclass", "target_bucketclass"],
argvalues=[
Expand Down
2 changes: 2 additions & 0 deletions tests/functional/object/mcg/test_verify_noobaa_status.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
red_squad,
runs_on_provider,
mcg,
skipif_noobaa_external_pgsql,
)
from ocs_ci.ocs import constants
from ocs_ci.ocs.resources.pod import get_pod_logs
Expand Down Expand Up @@ -46,6 +47,7 @@ def test_verify_noobaa_status_cli(mcg_obj_session):
@bugzilla("2004130")
@skipif_openshift_dedicated
@skipif_managed_service
@skipif_noobaa_external_pgsql
def test_verify_noobaa_db_service(mcg_obj_session):
"""
Validates whether MCG cli and noobaa db logs does not check 'noobaa-db'
Expand Down

0 comments on commit bb6b14d

Please sign in to comment.