Consolidate duplicate craft_s3_command into bucket_utils#14892
Consolidate duplicate craft_s3_command into bucket_utils#14892sagihirshfeld wants to merge 1 commit intored-hat-storage:masterfrom
Conversation
Remove the duplicate craft_s3_command from ocs_ci/helpers/helpers.py and update all consumers to use the version in ocs_ci/ocs/bucket_utils.py, which has proper SSL handling and multicluster support. Port the max_attempts (AWS_MAX_ATTEMPTS) retry logic from the helpers version into bucket_utils, preserving the default of 8 attempts. Signed-off-by: Sagi Hirshfeld <shirshfe@redhat.com> Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> Signed-off-by: Sagi Hirshfeld <shirshfe@redhat.com>
sagihirshfeld
added
Needs Testing
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: sagihirshfeld The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
ocs-ci
left a comment
ocs-ci
left a comment
There was a problem hiding this comment.
PR validation on existing cluster
Cluster Name: shirshfe-22ibm02
Cluster Configuration: conf/deployment/ibmcloud/ipi_3az_rhcos_3m_3w.yaml
PR Test Suite:
PR Test Path: tests/functional/object/mcg/test_nsfs.py::TestNSFSObjectIntegrity::test_nsfs_list_objects tests/functional/object/mcg/test_sts_client.py::TestSTSClient::test_sts_assume_role tests/functional/object/mcg/test_bucket_logs.py::TestBucketLogs::test_guaranteed_bucket_logs_management tests/functional/object/mcg/test_lifecycle_configuration.py::TestLifecycleConfiguration::test_lifecycle_config_ops_s3_clients_compatibility
Additional Test Params: --skip-rpm-go-version-collection
OCP VERSION: 4.22
OCS VERSION: 4.22
tested against branch: master
Job UNSTABLE (some or all tests failed).
|
The above verification failed due to an unrelated teardown issue which is now addressed in this PR: |
ocs-ci
left a comment
ocs-ci
left a comment
There was a problem hiding this comment.
PR validation on existing cluster
Cluster Name: shirshfe-22ibm02
Cluster Configuration: conf/deployment/ibmcloud/ipi_3az_rhcos_3m_3w.yaml
PR Test Suite:
PR Test Path: tests/functional/object/mcg/test_bucket_logs.py::TestBucketLogs::test_guaranteed_bucket_logs_management[default-logs-pvc]
Additional Test Params: --skip-rpm-go-version-collection
OCP VERSION: 4.22
OCS VERSION: 4.22
tested against branch: master
sagihirshfeld
added
Verified
2 participants
Remove the duplicate craft_s3_command from ocs_ci/helpers/helpers.py and update all consumers to use the version in ocs_ci/ocs/bucket_utils.py, which has proper SSL handling and multicluster support.
Port the max_attempts (AWS_MAX_ATTEMPTS) retry logic from the helpers version into bucket_utils, preserving the default of 8 attempts.