Skip to content

Commit

Permalink
fix squad assignment for manage/rgw tests (#8555)
Browse files Browse the repository at this point in the history
* fix squad assignment for manage/rgw tests

Signed-off-by: Daniel Horak <[email protected]>
  • Loading branch information
dahorak authored Sep 22, 2023
1 parent 4800b45 commit ab4580d
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 3 deletions.
8 changes: 7 additions & 1 deletion tests/manage/rgw/test_bucket_creation.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@

import pytest

from ocs_ci.framework.pytest_customization.marks import acceptance, tier1, tier3
from ocs_ci.framework.pytest_customization.marks import (
acceptance,
red_squad,
tier1,
tier3,
)
from ocs_ci.ocs.resources.objectbucket import BUCKET_MAP
from ocs_ci.ocs.exceptions import CommandFailed
import botocore
Expand All @@ -11,6 +16,7 @@
logger = logging.getLogger(__name__)


@red_squad
class TestRGWBucketCreation:
"""
Test creation of a bucket
Expand Down
8 changes: 7 additions & 1 deletion tests/manage/rgw/test_bucket_deletion.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@
from ocs_ci.ocs.bucket_utils import sync_object_directory

from ocs_ci.framework import config
from ocs_ci.framework.pytest_customization.marks import acceptance, tier1, tier3
from ocs_ci.framework.pytest_customization.marks import (
acceptance,
red_squad,
tier1,
tier3,
)
from ocs_ci.ocs.exceptions import CommandFailed
from ocs_ci.ocs.ocp import OCP
from ocs_ci.ocs.resources.objectbucket import OBC
Expand All @@ -15,6 +20,7 @@
logger = logging.getLogger(__name__)


@red_squad
class TestBucketDeletion:
"""
Test deletion of RGW buckets
Expand Down
2 changes: 2 additions & 0 deletions tests/manage/rgw/test_host_node_failure.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import pytest

from ocs_ci.framework import config
from ocs_ci.framework.pytest_customization.marks import red_squad
from ocs_ci.framework.testlib import (
ignore_leftovers,
ManageTest,
Expand Down Expand Up @@ -32,6 +33,7 @@
log = logging.getLogger(__name__)


@red_squad
@tier4b
@ignore_leftovers
@pytest.mark.polarion_id("OCS-2374")
Expand Down
2 changes: 2 additions & 0 deletions tests/manage/rgw/test_multipart_upload.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import uuid

from ocs_ci.framework.testlib import ManageTest, tier1
from ocs_ci.framework.pytest_customization.marks import red_squad
from ocs_ci.ocs.bucket_utils import (
verify_s3_object_integrity,
abort_all_multipart_upload,
Expand Down Expand Up @@ -48,6 +49,7 @@ def setup(pod_obj, rgw_bucket_factory, test_directory_setup):
return bucket, object_key, origin_dir, res_dir, full_object_path, parts


@red_squad
class TestS3MultipartUpload(ManageTest):
"""
Test Multipart upload on RGW buckets
Expand Down
2 changes: 2 additions & 0 deletions tests/manage/rgw/test_obc_quota.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@
tier1,
bugzilla,
skipif_ocs_version,
red_squad,
)

logger = logging.getLogger(__name__)


@red_squad
@bugzilla("1940823")
@skipif_ocs_version("<4.10")
class TestOBCQuota:
Expand Down
2 changes: 2 additions & 0 deletions tests/manage/rgw/test_object_bucket_size.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
)
from ocs_ci.ocs import constants, ocp
from ocs_ci.framework.pytest_customization.marks import (
red_squad,
skipif_managed_service,
)
from ocs_ci.ocs.bucket_utils import get_bucket_available_size
Expand Down Expand Up @@ -56,6 +57,7 @@ def compare_sizes(mcg_obj, ceph_obj, bucket_name):
)


@red_squad
@skipif_managed_service
@skipif_ocs_version("<4.7")
@pytest.mark.polarion_id("OCS-2476")
Expand Down
2 changes: 2 additions & 0 deletions tests/manage/rgw/test_object_integrity.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,15 @@
verify_s3_object_integrity,
)

from ocs_ci.framework.pytest_customization.marks import red_squad
from ocs_ci.framework.testlib import ManageTest, tier1, tier2
from ocs_ci.ocs.resources.objectbucket import OBC
from ocs_ci.ocs.constants import AWSCLI_TEST_OBJ_DIR

logger = logging.getLogger(__name__)


@red_squad
class TestObjectIntegrity(ManageTest):
"""
Test data integrity of RGW buckets
Expand Down
3 changes: 2 additions & 1 deletion tests/manage/rgw/test_rgw_pod_existence.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import logging

from ocs_ci.framework import config
from ocs_ci.framework.pytest_customization.marks import acceptance
from ocs_ci.framework.pytest_customization.marks import acceptance, red_squad
from ocs_ci.helpers.helpers import storagecluster_independent_check
from ocs_ci.ocs import constants
from ocs_ci.ocs.ocp import OCP
Expand All @@ -13,6 +13,7 @@
logger = logging.getLogger(__name__)


@red_squad
@acceptance
class TestRGWPodExistence:
"""
Expand Down

0 comments on commit ab4580d

Please sign in to comment.