diff --git a/ocs_ci/ocs/resources/cloud_manager.py b/ocs_ci/ocs/resources/cloud_manager.py index b3a226f232a..c162d517f44 100644 --- a/ocs_ci/ocs/resources/cloud_manager.py +++ b/ocs_ci/ocs/resources/cloud_manager.py @@ -151,7 +151,7 @@ def delete_uls(self, name): try: for deletion_result in TimeoutSampler( - 60, 5, self.internal_delete_uls, name + 300, 5, self.internal_delete_uls, name ): if deletion_result: logger.info("ULS deleted.") diff --git a/tests/cross_functional/scale/noobaa/test_warp.py b/tests/cross_functional/scale/noobaa/test_warp.py index 30115c3b299..d43e99abce5 100644 --- a/tests/cross_functional/scale/noobaa/test_warp.py +++ b/tests/cross_functional/scale/noobaa/test_warp.py @@ -1,8 +1,8 @@ import logging import pytest +from time import sleep from ocs_ci.ocs import warp from ocs_ci.utility import utils -from ocs_ci.ocs.constants import DEFAULT_STORAGECLASS_RBD from ocs_ci.ocs.scale_noobaa_lib import ( get_noobaa_pods_status, check_memory_leak_in_noobaa_endpoint_log, @@ -48,18 +48,6 @@ class TestWarp(E2ETest): pytest.param( *[1, "OC", None], ), - pytest.param( - *[ - 1, - "OC", - { - "interface": "OC", - "backingstore_dict": { - "pv": [(1, 100, DEFAULT_STORAGECLASS_RBD)] - }, - }, - ], - ), pytest.param( *[ 1, @@ -94,7 +82,6 @@ class TestWarp(E2ETest): ], ids=[ "OC-DEFAULT-BACKINGSTORE", - "OC-PVPOOL", "OC-AWS", "OC-AZURE", "OC-GCP", @@ -129,17 +116,20 @@ def test_s3_benchmark_warp( # Check noobaa pods status before running Warp benchmark get_noobaa_pods_status() + # Sleeping script for 1 minute before triggering warp workload + sleep(60) + # Running warp s3 benchmark warps3.run_benchmark( bucket_name=object_bucket.name, access_key=mcg_obj.access_key_id, secret_key=mcg_obj.access_key, - duration="60m", - concurrent=20, + duration="30m", + concurrent=1, objects=5000, obj_size="4KB", validate=True, - timeout=4000, + timeout=8000, multi_client=False, )