Merge pull request #8191 from shirady/update-ceph-test

CI | Update Commit Hash in Ceph Tests
noobaa · Jul 9, 2024 · bc4eff6 · bc4eff6
2 parents 22d5019 + e08c1dd
commit bc4eff6
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/src/test/system_tests/ceph_s3_tests/s3-tests-lists/nsfs_s3_tests_black_list.txt b/src/test/system_tests/ceph_s3_tests/s3-tests-lists/nsfs_s3_tests_black_list.txt
@@ -123,7 +123,6 @@ s3tests_boto3/functional/test_s3.py::test_post_object_missing_content_length_arg
 s3tests_boto3/functional/test_s3.py::test_post_object_invalid_content_length_argument
 s3tests_boto3/functional/test_s3.py::test_post_object_upload_size_below_minimum
 s3tests_boto3/functional/test_s3.py::test_post_object_empty_conditions
-s3tests_boto3/functional/test_s3.py::test_post_object_wrong_bucket
 s3tests_boto3/functional/test_s3.py::test_put_object_ifmatch_nonexisted_failed
 s3tests_boto3/functional/test_s3.py::test_object_raw_get_bucket_gone
 s3tests_boto3/functional/test_s3.py::test_object_raw_get

diff --git a/src/test/system_tests/ceph_s3_tests/s3-tests-lists/nsfs_s3_tests_pending_list.txt b/src/test/system_tests/ceph_s3_tests/s3-tests-lists/nsfs_s3_tests_pending_list.txt
@@ -216,4 +216,10 @@ s3tests/functional/test_headers.py::test_bucket_create_bad_contentlength_empty
 s3tests/functional/test_headers.py::test_object_create_bad_date_none_aws2
 s3tests/functional/test_headers.py::test_bucket_create_bad_authorization_invalid_aws2
 s3tests/functional/test_headers.py::test_bucket_create_bad_date_none_aws2
-s3tests_boto3/functional/test_s3.py::test_versioned_concurrent_object_create_and_remove
+s3tests_boto3/functional/test_s3.py::test_versioned_concurrent_object_create_and_remove
+s3tests_boto3/functional/test_s3.py::test_post_object_wrong_bucket
+s3tests_boto3/functional/test_s3.py::test_cors_presigned_put_object
+s3tests_boto3/functional/test_s3.py::test_cors_presigned_put_object_with_acl
+s3tests_boto3/functional/test_s3.py::test_cors_presigned_put_object_tenant
+s3tests_boto3/functional/test_s3.py::test_cors_presigned_put_object_tenant_with_acl
+s3tests_boto3/functional/test_s3.py::test_object_presigned_put_object_with_acl_tenant
diff --git a/src/test/system_tests/ceph_s3_tests/s3-tests-lists/s3_tests_black_list.txt b/src/test/system_tests/ceph_s3_tests/s3-tests-lists/s3_tests_black_list.txt
@@ -123,7 +123,6 @@ s3tests_boto3/functional/test_s3.py::test_post_object_missing_content_length_arg
 s3tests_boto3/functional/test_s3.py::test_post_object_invalid_content_length_argument
 s3tests_boto3/functional/test_s3.py::test_post_object_upload_size_below_minimum
 s3tests_boto3/functional/test_s3.py::test_post_object_empty_conditions
-s3tests_boto3/functional/test_s3.py::test_post_object_wrong_bucket
 s3tests_boto3/functional/test_s3.py::test_put_object_ifmatch_nonexisted_failed
 s3tests_boto3/functional/test_s3.py::test_object_raw_get_bucket_gone
 s3tests_boto3/functional/test_s3.py::test_object_raw_get

diff --git a/src/test/system_tests/ceph_s3_tests/s3-tests-lists/s3_tests_pending_list.txt b/src/test/system_tests/ceph_s3_tests/s3-tests-lists/s3_tests_pending_list.txt
@@ -130,4 +130,10 @@ s3tests/functional/test_headers.py::test_object_create_bad_date_none_aws2
 s3tests/functional/test_headers.py::test_bucket_create_bad_authorization_invalid_aws2
 s3tests/functional/test_headers.py::test_bucket_create_bad_date_none_aws2
 s3tests_boto3/functional/test_s3.py::test_get_object_ifnonematch_good
-s3tests_boto3/functional/test_s3.py::test_get_object_ifmodifiedsince_failed
+s3tests_boto3/functional/test_s3.py::test_get_object_ifmodifiedsince_failed
+s3tests_boto3/functional/test_s3.py::test_post_object_wrong_bucket
+s3tests_boto3/functional/test_s3.py::test_cors_presigned_put_object
+s3tests_boto3/functional/test_s3.py::test_cors_presigned_put_object_with_acl
+s3tests_boto3/functional/test_s3.py::test_cors_presigned_put_object_tenant
+s3tests_boto3/functional/test_s3.py::test_cors_presigned_put_object_tenant_with_acl
+s3tests_boto3/functional/test_s3.py::test_object_presigned_put_object_with_acl_tenant
diff --git a/src/test/system_tests/ceph_s3_tests/test_ceph_s3_deploy.sh b/src/test/system_tests/ceph_s3_tests/test_ceph_s3_deploy.sh
@@ -17,7 +17,7 @@ DIRECTORY="s3-tests"
 CEPH_LINK="https://github.com/ceph/s3-tests.git"
 # using a fixed version (commit) of ceph tests to avoid sudden changes. 
 # we should retest and update the version once in a while
-CEPH_TESTS_VERSION=da91ad8bbf899c72199df35b69e9393c706aabee
+CEPH_TESTS_VERSION=997f78d58ac7b991e555328953fc8e72d912a303
 if [ ! -d $DIRECTORY ]; then
     echo "Downloading Ceph S3 Tests..."
     git clone $CEPH_LINK