Skip to content

Commit 063231c

Browse files
author
Aayush
committed
Update commit hash in ceph tests, moved failed tests to pending/black list
Signed-off-by: Aayush <aayush@li-2392f9cc-287a-11b2-a85c-9fcc04b05da6.ibm.com>
1 parent 9ab748b commit 063231c

10 files changed

+236
-13
lines changed

‎docs/dev_guide/ceph_s3_tests/ceph_s3_tests_pending_list_status.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,6 @@ Attached a table with tests that where investigated and their status (this table
5151
| test_get_bucket_encryption_kms | Faulty Test | [613](https://github.com/ceph/s3-tests/issues/613) |
5252
| test_delete_bucket_encryption_s3 | Faulty Test | [613](https://github.com/ceph/s3-tests/issues/613) |
5353
| test_delete_bucket_encryption_kms | Faulty Test | [613](https://github.com/ceph/s3-tests/issues/613) |
54-
| test_lifecycle_expiration_tags1 | Faulty Test | [638](https://github.com/ceph/s3-tests/issues/638) | There can be more such tests having the same issue (`Filter` is not aligned with aws structure in bucket lifecycle configuration) |
54+
| test_lifecycle_expiration_tags1 | Faulty Test | [638](https://github.com/ceph/s3-tests/issues/638) | There can be more such tests having the same issue (`Filter` is not aligned with aws structure in bucket lifecycle configuration) |
55+
| test_bucket_create_bad_ua_empty_aws2 | Internal Component | [58059](https://tracker.ceph.com/issues/58059) | It is a known issue in ceph tests after updating botocore version (>1.28.0) it brokes v2 signatures |
56+
| test_bucket_create_bad_ua_none_aws2 | Internal Component | [58059](https://tracker.ceph.com/issues/58059) | It is a known issue in ceph tests after updating botocore version (>1.28.0) it brokes v2 signatures |

‎src/test/external_tests/ceph_s3_tests/s3-tests-lists/nsfs_s3_tests_black_list.txt

Lines changed: 84 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,4 +400,87 @@ s3tests_boto3/functional/test_s3.py::test_cors_presigned_get_object_tenant
400400
s3tests_boto3/functional/test_s3.py::test_cors_presigned_put_object_with_acl
401401
s3tests_boto3/functional/test_s3.py::test_cors_presigned_put_object_tenant
402402
s3tests_boto3/functional/test_s3.py::test_cors_presigned_put_object_tenant_with_acl
403-
403+
s3tests_boto3/functional/test_s3.py::test_put_bucket_acl_grant_group_read
404+
s3tests_boto3/functional/test_s3.py::test_multipart_sse_c_get_part
405+
s3tests_boto3/functional/test_s3.py::test_multipart_single_get_part
406+
s3tests_boto3/functional/test_s3.py::test_non_multipart_sse_c_get_part
407+
s3tests_boto3/functional/test_s3.py::test_cors_presigned_get_object_v2
408+
s3tests_boto3/functional/test_s3.py::test_cors_presigned_get_object_tenant_v2
409+
s3tests_boto3/functional/test_s3.py::test_cors_presigned_put_object_v2
410+
s3tests_boto3/functional/test_s3.py::test_cors_presigned_put_object_tenant_v2
411+
s3tests_boto3/functional/test_s3.py::test_lifecycle_delete
412+
s3tests_boto3/functional/test_s3.py::test_lifecycle_deletemarker_expiration_with_days_tag
413+
s3tests_boto3/functional/test_s3.py::test_encryption_sse_c_enforced_with_bucket_policy
414+
s3tests_boto3/functional/test_s3.py::test_encryption_sse_c_deny_algo_with_bucket_policy
415+
s3tests_boto3/functional/test_s3.py::test_bucket_policy_multipart
416+
s3tests_boto3/functional/test_s3.py::test_bucket_policy_tenanted_bucket
417+
s3tests_boto3/functional/test_s3.py::test_set_get_del_bucket_policy
418+
s3tests_boto3/functional/test_s3.py::test_set_multipart_tagging
419+
s3tests_boto3/functional/test_s3.py::test_bucket_policy_upload_part_copy
420+
s3tests_boto3/functional/test_s3.py::test_bucket_policy_put_obj_s3_incorrect_algo_sse_s3
421+
s3tests_boto3/functional/test_s3.py::test_object_lock_put_obj_lock_enable_after_create
422+
s3tests_boto3/functional/test_s3.py::test_get_nonpublicpolicy_principal_bucket_policy_status
423+
s3tests_boto3/functional/test_s3.py::test_block_public_policy_with_principal
424+
s3tests_boto3/functional/test_s3.py::test_block_public_restrict_public_buckets
425+
s3tests_boto3/functional/test_s3.py::test_put_get_delete_public_block
426+
s3tests_boto3/functional/test_s3.py::test_object_checksum_sha256
427+
s3tests_boto3/functional/test_s3.py::test_object_checksum_crc64nvme
428+
s3tests_boto3/functional/test_s3.py::test_multipart_checksum_sha256
429+
s3tests_boto3/functional/test_s3.py::test_multipart_use_cksum_helper_sha256
430+
s3tests_boto3/functional/test_s3.py::test_multipart_use_cksum_helper_crc64nvme
431+
s3tests_boto3/functional/test_s3.py::test_multipart_use_cksum_helper_crc32
432+
s3tests_boto3/functional/test_s3.py::test_multipart_use_cksum_helper_crc32c
433+
s3tests_boto3/functional/test_s3.py::test_multipart_use_cksum_helper_sha1
434+
s3tests_boto3/functional/test_s3.py::test_post_object_upload_checksum
435+
s3tests_boto3/functional/test_s3.py::test_put_bucket_logging
436+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_mtime
437+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_simple_key
438+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_partitioned_key
439+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_bucket_auth_type
440+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_bucket_acl_required
441+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_object_acl_required
442+
s3tests_boto3/functional/test_s3.py::test_put_bucket_logging_errors
443+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_owner
444+
s3tests_boto3/functional/test_s3.py::test_put_bucket_logging_permissions
445+
s3tests_boto3/functional/test_s3.py::test_put_bucket_logging_policy_wildcard
446+
s3tests_boto3/functional/test_s3.py::test_put_bucket_logging_policy_wildcard_objects
447+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_permission_change_s
448+
s3tests_boto3/functional/test_s3.py::test_put_bucket_logging_tenant_s
449+
s3tests_boto3/functional/test_s3.py::test_put_bucket_logging_account_s
450+
s3tests_boto3/functional/test_s3.py::test_rm_bucket_logging
451+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_put_objects
452+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_put_objects_versioned
453+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_put_concurrency
454+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_delete_objects
455+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_delete_objects_versioned
456+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_get_objects
457+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_get_objects_versioned
458+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_copy_objects
459+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_copy_objects_versioned
460+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_copy_objects_bucket
461+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_copy_objects_bucket_versioned
462+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_head_objects
463+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_head_objects_versioned
464+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_mpu_s
465+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_mpu_versioned_s
466+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_mpu_copy
467+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_mpu_copy_versioned
468+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_multi_delete
469+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_multi_delete_versioned
470+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_multiple_prefixes
471+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_single_prefix
472+
s3tests_boto3/functional/test_s3.py::test_get_multipart_checksum_object_attributes
473+
s3tests_boto3/functional/test_s3.py::test_get_multipart_object_attributes
474+
s3tests_boto3/functional/test_s3.py::test_get_paginated_multipart_object_attributes
475+
s3tests_boto3/functional/test_s3.py::test_get_single_multipart_object_attributes
476+
s3tests_boto3/functional/test_s3.py::test_get_checksum_object_attributes
477+
s3tests_boto3/functional/test_s3.py::test_get_versioned_object_attributes
478+
s3tests_boto3/functional/test_s3.py::test_get_sse_c_encrypted_object_attributes
479+
s3tests_boto3/functional/test_s3.py::test_get_object_attributes
480+
s3tests_boto3/functional/test_s3.py::test_delete_marker_nonversioned
481+
s3tests_boto3/functional/test_s3.py::test_delete_marker_versioned
482+
s3tests_boto3/functional/test_s3.py::test_delete_marker_suspended
483+
s3tests_boto3/functional/test_s3.py::test_delete_marker_expiration
484+
s3tests_boto3/functional/test_sts.py::test_get_caller_identity_root
485+
s3tests_boto3/functional/test_sts.py::test_get_caller_identity_non_root_user
486+
s3tests_boto3/functional/test_sts.py::test_get_caller_identity_after_assume_role

‎src/test/external_tests/ceph_s3_tests/s3-tests-lists/nsfs_s3_tests_pending_list.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,4 +154,6 @@ s3tests_boto3/functional/test_s3.py::test_versioned_concurrent_object_create_and
154154
s3tests_boto3/functional/test_s3.py::test_object_presigned_put_object_with_acl_tenant
155155
s3tests_boto3/functional/test_s3.py::test_get_undefined_public_block
156156
s3tests_boto3/functional/test_s3.py::test_get_public_block_deny_bucket_policy
157-
s3tests_boto3/functional/test_s3.py::test_lifecycle_expiration_tags1
157+
s3tests_boto3/functional/test_s3.py::test_lifecycle_expiration_tags1
158+
s3tests_boto3/functional/test_headers.py::test_bucket_create_bad_ua_empty_aws2
159+
s3tests_boto3/functional/test_headers.py::test_bucket_create_bad_ua_none_aws2

‎src/test/external_tests/ceph_s3_tests/s3-tests-lists/s3_tests_black_list.txt

Lines changed: 85 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,4 +350,88 @@ s3tests_boto3/functional/test_sts.py::test_assume_role_with_web_identity_resourc
350350
s3tests_boto3/functional/test_sts.py::test_assume_role_with_web_identity_resource_tag_copy_obj
351351
s3tests_boto3/functional/test_sts.py::test_assume_role_with_web_identity_role_resource_tag
352352
s3tests_boto3/functional/test_s3.py::test_cors_presigned_put_object_with_acl
353-
s3tests_boto3/functional/test_s3.py::test_cors_presigned_put_object_tenant_with_acl
353+
s3tests_boto3/functional/test_s3.py::test_cors_presigned_put_object_tenant_with_acl
354+
s3tests_boto3/functional/test_s3.py::test_put_bucket_acl_grant_group_read
355+
s3tests_boto3/functional/test_s3.py::test_multipart_sse_c_get_part
356+
s3tests_boto3/functional/test_s3.py::test_multipart_single_get_part
357+
s3tests_boto3/functional/test_s3.py::test_non_multipart_sse_c_get_part
358+
s3tests_boto3/functional/test_s3.py::test_cors_presigned_get_object_v2
359+
s3tests_boto3/functional/test_s3.py::test_cors_presigned_get_object_tenant_v2
360+
s3tests_boto3/functional/test_s3.py::test_cors_presigned_put_object_v2
361+
s3tests_boto3/functional/test_s3.py::test_cors_presigned_put_object_tenant_v2
362+
s3tests_boto3/functional/test_s3.py::test_lifecycle_delete
363+
s3tests_boto3/functional/test_s3.py::test_lifecycle_deletemarker_expiration_with_days_tag
364+
s3tests_boto3/functional/test_s3.py::test_encryption_sse_c_enforced_with_bucket_policy
365+
s3tests_boto3/functional/test_s3.py::test_encryption_sse_c_deny_algo_with_bucket_policy
366+
s3tests_boto3/functional/test_s3.py::test_bucket_policy_multipart
367+
s3tests_boto3/functional/test_s3.py::test_bucket_policy_tenanted_bucket
368+
s3tests_boto3/functional/test_s3.py::test_set_get_del_bucket_policy
369+
s3tests_boto3/functional/test_s3.py::test_bucket_policy_upload_part_copy
370+
s3tests_boto3/functional/test_s3.py::test_bucket_policy_put_obj_s3_incorrect_algo_sse_s3
371+
s3tests_boto3/functional/test_s3.py::test_object_lock_put_obj_lock_enable_after_create
372+
s3tests_boto3/functional/test_s3.py::test_get_nonpublicpolicy_principal_bucket_policy_status
373+
s3tests_boto3/functional/test_s3.py::test_block_public_policy_with_principal
374+
s3tests_boto3/functional/test_s3.py::test_block_public_restrict_public_buckets
375+
s3tests_boto3/functional/test_s3.py::test_put_get_delete_public_block
376+
s3tests_boto3/functional/test_s3.py::test_object_checksum_sha256
377+
s3tests_boto3/functional/test_s3.py::test_object_checksum_crc64nvme
378+
s3tests_boto3/functional/test_s3.py::test_multipart_checksum_sha256
379+
s3tests_boto3/functional/test_s3.py::test_multipart_use_cksum_helper_sha256
380+
s3tests_boto3/functional/test_s3.py::test_multipart_use_cksum_helper_crc64nvme
381+
s3tests_boto3/functional/test_s3.py::test_multipart_use_cksum_helper_crc32
382+
s3tests_boto3/functional/test_s3.py::test_multipart_use_cksum_helper_crc32c
383+
s3tests_boto3/functional/test_s3.py::test_multipart_use_cksum_helper_sha1
384+
s3tests_boto3/functional/test_s3.py::test_post_object_upload_checksum
385+
s3tests_boto3/functional/test_s3.py::test_put_bucket_logging
386+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_mtime
387+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_simple_key
388+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_partitioned_key
389+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_bucket_auth_type
390+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_bucket_acl_required
391+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_object_acl_required
392+
s3tests_boto3/functional/test_s3.py::test_put_bucket_logging_errors
393+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_owner
394+
s3tests_boto3/functional/test_s3.py::test_put_bucket_logging_permissions
395+
s3tests_boto3/functional/test_s3.py::test_put_bucket_logging_policy_wildcard
396+
s3tests_boto3/functional/test_s3.py::test_put_bucket_logging_policy_wildcard_objects
397+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_permission_change_s
398+
s3tests_boto3/functional/test_s3.py::test_put_bucket_logging_tenant_s
399+
s3tests_boto3/functional/test_s3.py::test_put_bucket_logging_account_s
400+
s3tests_boto3/functional/test_s3.py::test_rm_bucket_logging
401+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_put_objects
402+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_put_objects_versioned
403+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_put_concurrency
404+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_delete_objects
405+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_delete_objects_versioned
406+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_get_objects
407+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_get_objects_versioned
408+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_copy_objects
409+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_copy_objects_versioned
410+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_copy_objects_bucket
411+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_copy_objects_bucket_versioned
412+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_head_objects
413+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_head_objects_versioned
414+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_mpu_s
415+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_mpu_versioned_s
416+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_mpu_copy
417+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_mpu_copy_versioned
418+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_multi_delete
419+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_multi_delete_versioned
420+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_multiple_prefixes
421+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_single_prefix
422+
s3tests_boto3/functional/test_s3.py::test_get_multipart_checksum_object_attributes
423+
s3tests_boto3/functional/test_s3.py::test_get_multipart_object_attributes
424+
s3tests_boto3/functional/test_s3.py::test_get_paginated_multipart_object_attributes
425+
s3tests_boto3/functional/test_s3.py::test_get_single_multipart_object_attributes
426+
s3tests_boto3/functional/test_s3.py::test_get_checksum_object_attributes
427+
s3tests_boto3/functional/test_s3.py::test_get_versioned_object_attributes
428+
s3tests_boto3/functional/test_s3.py::test_get_sse_c_encrypted_object_attributes
429+
s3tests_boto3/functional/test_s3.py::test_get_object_attributes
430+
s3tests_boto3/functional/test_s3.py::test_upload_part_copy_percent_encoded_key
431+
s3tests_boto3/functional/test_s3.py::test_delete_marker_nonversioned
432+
s3tests_boto3/functional/test_s3.py::test_delete_marker_versioned
433+
s3tests_boto3/functional/test_s3.py::test_delete_marker_suspended
434+
s3tests_boto3/functional/test_s3.py::test_delete_marker_expiration
435+
s3tests_boto3/functional/test_sts.py::test_get_caller_identity_root
436+
s3tests_boto3/functional/test_sts.py::test_get_caller_identity_non_root_user
437+
s3tests_boto3/functional/test_sts.py::test_get_caller_identity_after_assume_role

‎src/test/external_tests/ceph_s3_tests/s3-tests-lists/s3_tests_pending_list.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,4 +143,8 @@ s3tests_boto3/functional/test_s3.py::test_get_bucket_encryption_s3
143143
s3tests_boto3/functional/test_s3.py::test_get_bucket_encryption_kms
144144
s3tests_boto3/functional/test_s3.py::test_delete_bucket_encryption_s3
145145
s3tests_boto3/functional/test_s3.py::test_delete_bucket_encryption_kms
146-
s3tests_boto3/functional/test_s3.py::test_lifecycle_expiration_tags1
146+
s3tests_boto3/functional/test_s3.py::test_lifecycle_expiration_tags1
147+
s3tests_boto3/functional/test_headers.py::test_bucket_create_bad_ua_empty_aws2
148+
s3tests_boto3/functional/test_headers.py::test_bucket_create_bad_ua_none_aws2
149+
s3tests_boto3/functional/test_headers.py::test_object_create_bad_md5_bad
150+
s3tests_boto3/functional/test_headers.py::test_object_create_bad_md5_none

‎src/test/external_tests/ceph_s3_tests/test_ceph_nsfs_s3_config_setup.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,15 @@ async function ceph_test_setup() {
5353
const cephalt_access_key = cephalt_access_keys.access_key;
5454
const cephalt_secret_key = cephalt_access_keys.secret_key;
5555

56-
await os_utils.exec(`echo access_key = ${cephalt_access_key} >> ${CEPH_TEST.test_dir}${CEPH_TEST.ceph_config}`);
57-
await os_utils.exec(`echo secret_key = ${cephalt_secret_key} >> ${CEPH_TEST.test_dir}${CEPH_TEST.ceph_config}`);
58-
5956
const cephtenant_access_keys = await get_access_keys(CEPH_TEST.nc_cephtenant_account_params.name);
6057
const cephtenant_access_key = cephtenant_access_keys.access_key;
6158
const cephtenant_secret_key = cephtenant_access_keys.secret_key;
6259

6360
if (os_utils.IS_MAC) {
6461
await os_utils.exec(`sed -i "" "s|tenant_access_key|"${cephtenant_access_key}"|g" ${CEPH_TEST.test_dir}${CEPH_TEST.ceph_config}`);
6562
await os_utils.exec(`sed -i "" "s|tenant_secret_key|${cephtenant_secret_key}|g" ${CEPH_TEST.test_dir}${CEPH_TEST.ceph_config}`);
63+
await os_utils.exec(`sed -i "" "s|s3_access_key|${cephalt_access_key}|g" ${CEPH_TEST.test_dir}${CEPH_TEST.ceph_config}`);
64+
await os_utils.exec(`sed -i "" "s|s3_secret_key|${cephalt_secret_key}|g" ${CEPH_TEST.test_dir}${CEPH_TEST.ceph_config}`);
6665
} else {
6766
await os_utils.exec(`sed -i -e 's:tenant_access_key:${cephtenant_access_key}:g' ${CEPH_TEST.test_dir}${CEPH_TEST.ceph_config}`);
6867
await os_utils.exec(`sed -i -e 's:tenant_secret_key:${cephtenant_secret_key}:g' ${CEPH_TEST.test_dir}${CEPH_TEST.ceph_config}`);

‎src/test/external_tests/ceph_s3_tests/test_ceph_s3.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ async function run_s3_tests() {
7676
async function run_all_tests() {
7777
console.info('Running Ceph S3 Tests...');
7878
const tests_list_command =
79-
`S3TEST_CONF=${process.cwd()}/${CEPH_TEST.test_dir}${CEPH_TEST.ceph_config} tox ${TOX_ARGS} -- -q --collect-only --disable-pytest-warnings 2>&1 | awk '{print $1}' | grep test`;
79+
`S3TEST_CONF=${process.cwd()}/${CEPH_TEST.test_dir}${CEPH_TEST.ceph_config} tox ${TOX_ARGS} -- -q --collect-only --disable-pytest-warnings 2>&1 | awk '{print $1}' | grep "::test"`;
8080
try {
8181
tests_list = await os_utils.exec(tests_list_command, { ignore_rc: false, return_stdout: true });
8282
} catch (err) {

0 commit comments

Comments
 (0)