Skip to content

Commit 39279b8

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

File tree

7 files changed

+221
-10
lines changed

7 files changed

+221
-10
lines changed

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

Lines changed: 84 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,4 +154,87 @@ 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
160+
s3tests_boto3/functional/test_s3.py::test_put_bucket_acl_grant_group_read
161+
s3tests_boto3/functional/test_s3.py::test_multipart_sse_c_get_part
162+
s3tests_boto3/functional/test_s3.py::test_multipart_single_get_part
163+
s3tests_boto3/functional/test_s3.py::test_non_multipart_sse_c_get_part
164+
s3tests_boto3/functional/test_s3.py::test_cors_presigned_get_object_v2
165+
s3tests_boto3/functional/test_s3.py::test_cors_presigned_get_object_tenant_v2
166+
s3tests_boto3/functional/test_s3.py::test_cors_presigned_put_object_v2
167+
s3tests_boto3/functional/test_s3.py::test_cors_presigned_put_object_tenant_v2
168+
s3tests_boto3/functional/test_s3.py::test_lifecycle_delete
169+
s3tests_boto3/functional/test_s3.py::test_lifecycle_deletemarker_expiration_with_days_tag
170+
s3tests_boto3/functional/test_s3.py::test_encryption_sse_c_enforced_with_bucket_policy
171+
s3tests_boto3/functional/test_s3.py::test_encryption_sse_c_deny_algo_with_bucket_policy
172+
s3tests_boto3/functional/test_s3.py::test_bucket_policy_multipart
173+
s3tests_boto3/functional/test_s3.py::test_bucket_policy_tenanted_bucket
174+
s3tests_boto3/functional/test_s3.py::test_set_get_del_bucket_policy
175+
s3tests_boto3/functional/test_s3.py::test_set_multipart_tagging
176+
s3tests_boto3/functional/test_s3.py::test_bucket_policy_upload_part_copy
177+
s3tests_boto3/functional/test_s3.py::test_bucket_policy_put_obj_s3_incorrect_algo_sse_s3
178+
s3tests_boto3/functional/test_s3.py::test_object_lock_put_obj_lock_enable_after_create
179+
s3tests_boto3/functional/test_s3.py::test_get_nonpublicpolicy_principal_bucket_policy_status
180+
s3tests_boto3/functional/test_s3.py::test_block_public_policy_with_principal
181+
s3tests_boto3/functional/test_s3.py::test_block_public_restrict_public_buckets
182+
s3tests_boto3/functional/test_s3.py::test_put_get_delete_public_block
183+
s3tests_boto3/functional/test_s3.py::test_object_checksum_sha256
184+
s3tests_boto3/functional/test_s3.py::test_object_checksum_crc64nvme
185+
s3tests_boto3/functional/test_s3.py::test_multipart_checksum_sha256
186+
s3tests_boto3/functional/test_s3.py::test_multipart_use_cksum_helper_sha256
187+
s3tests_boto3/functional/test_s3.py::test_multipart_use_cksum_helper_crc64nvme
188+
s3tests_boto3/functional/test_s3.py::test_multipart_use_cksum_helper_crc32
189+
s3tests_boto3/functional/test_s3.py::test_multipart_use_cksum_helper_crc32c
190+
s3tests_boto3/functional/test_s3.py::test_multipart_use_cksum_helper_sha1
191+
s3tests_boto3/functional/test_s3.py::test_post_object_upload_checksum
192+
s3tests_boto3/functional/test_s3.py::test_put_bucket_logging
193+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_mtime
194+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_simple_key
195+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_partitioned_key
196+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_bucket_auth_type
197+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_bucket_acl_required
198+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_object_acl_required
199+
s3tests_boto3/functional/test_s3.py::test_put_bucket_logging_errors
200+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_owner
201+
s3tests_boto3/functional/test_s3.py::test_put_bucket_logging_permissions
202+
s3tests_boto3/functional/test_s3.py::test_put_bucket_logging_policy_wildcard
203+
s3tests_boto3/functional/test_s3.py::test_put_bucket_logging_policy_wildcard_objects
204+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_permission_change_s
205+
s3tests_boto3/functional/test_s3.py::test_put_bucket_logging_tenant_s
206+
s3tests_boto3/functional/test_s3.py::test_put_bucket_logging_account_s
207+
s3tests_boto3/functional/test_s3.py::test_rm_bucket_logging
208+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_put_objects
209+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_put_objects_versioned
210+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_put_concurrency
211+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_delete_objects
212+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_delete_objects_versioned
213+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_get_objects
214+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_get_objects_versioned
215+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_copy_objects
216+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_copy_objects_versioned
217+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_copy_objects_bucket
218+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_copy_objects_bucket_versioned
219+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_head_objects
220+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_head_objects_versioned
221+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_mpu_s
222+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_mpu_versioned_s
223+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_mpu_copy
224+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_mpu_copy_versioned
225+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_multi_delete
226+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_multi_delete_versioned
227+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_multiple_prefixes
228+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_single_prefix
229+
s3tests_boto3/functional/test_s3.py::test_get_multipart_checksum_object_attributes
230+
s3tests_boto3/functional/test_s3.py::test_get_multipart_object_attributes
231+
s3tests_boto3/functional/test_s3.py::test_get_paginated_multipart_object_attributes
232+
s3tests_boto3/functional/test_s3.py::test_get_single_multipart_object_attributes
233+
s3tests_boto3/functional/test_s3.py::test_get_checksum_object_attributes
234+
s3tests_boto3/functional/test_s3.py::test_get_versioned_object_attributes
235+
s3tests_boto3/functional/test_s3.py::test_get_sse_c_encrypted_object_attributes
236+
s3tests_boto3/functional/test_s3.py::test_get_object_attributes
237+
s3tests_boto3/functional/test_s3.py::test_delete_marker_nonversioned
238+
s3tests_boto3/functional/test_s3.py::test_delete_marker_versioned
239+
s3tests_boto3/functional/test_s3.py::test_delete_marker_suspended
240+
s3tests_boto3/functional/test_s3.py::test_delete_marker_expiration

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

Lines changed: 84 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,4 +143,87 @@ 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_s3.py::test_put_bucket_acl_grant_group_read
150+
s3tests_boto3/functional/test_s3.py::test_multipart_sse_c_get_part
151+
s3tests_boto3/functional/test_s3.py::test_multipart_single_get_part
152+
s3tests_boto3/functional/test_s3.py::test_non_multipart_sse_c_get_part
153+
s3tests_boto3/functional/test_s3.py::test_cors_presigned_get_object_v2
154+
s3tests_boto3/functional/test_s3.py::test_cors_presigned_get_object_tenant_v2
155+
s3tests_boto3/functional/test_s3.py::test_cors_presigned_put_object_v2
156+
s3tests_boto3/functional/test_s3.py::test_cors_presigned_put_object_tenant_v2
157+
s3tests_boto3/functional/test_s3.py::test_lifecycle_delete
158+
s3tests_boto3/functional/test_s3.py::test_lifecycle_deletemarker_expiration_with_days_tag
159+
s3tests_boto3/functional/test_s3.py::test_encryption_sse_c_enforced_with_bucket_policy
160+
s3tests_boto3/functional/test_s3.py::test_encryption_sse_c_deny_algo_with_bucket_policy
161+
s3tests_boto3/functional/test_s3.py::test_bucket_policy_multipart
162+
s3tests_boto3/functional/test_s3.py::test_bucket_policy_tenanted_bucket
163+
s3tests_boto3/functional/test_s3.py::test_set_get_del_bucket_policy
164+
s3tests_boto3/functional/test_s3.py::test_bucket_policy_upload_part_copy
165+
s3tests_boto3/functional/test_s3.py::test_bucket_policy_put_obj_s3_incorrect_algo_sse_s3
166+
s3tests_boto3/functional/test_s3.py::test_object_lock_put_obj_lock_enable_after_create
167+
s3tests_boto3/functional/test_s3.py::test_get_nonpublicpolicy_principal_bucket_policy_status
168+
s3tests_boto3/functional/test_s3.py::test_block_public_policy_with_principal
169+
s3tests_boto3/functional/test_s3.py::test_block_public_restrict_public_buckets
170+
s3tests_boto3/functional/test_s3.py::test_put_get_delete_public_block
171+
s3tests_boto3/functional/test_s3.py::test_object_checksum_sha256
172+
s3tests_boto3/functional/test_s3.py::test_object_checksum_crc64nvme
173+
s3tests_boto3/functional/test_s3.py::test_multipart_checksum_sha256
174+
s3tests_boto3/functional/test_s3.py::test_multipart_use_cksum_helper_sha256
175+
s3tests_boto3/functional/test_s3.py::test_multipart_use_cksum_helper_crc64nvme
176+
s3tests_boto3/functional/test_s3.py::test_multipart_use_cksum_helper_crc32
177+
s3tests_boto3/functional/test_s3.py::test_multipart_use_cksum_helper_crc32c
178+
s3tests_boto3/functional/test_s3.py::test_multipart_use_cksum_helper_sha1
179+
s3tests_boto3/functional/test_s3.py::test_post_object_upload_checksum
180+
s3tests_boto3/functional/test_s3.py::test_put_bucket_logging
181+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_mtime
182+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_simple_key
183+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_partitioned_key
184+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_bucket_auth_type
185+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_bucket_acl_required
186+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_object_acl_required
187+
s3tests_boto3/functional/test_s3.py::test_put_bucket_logging_errors
188+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_owner
189+
s3tests_boto3/functional/test_s3.py::test_put_bucket_logging_permissions
190+
s3tests_boto3/functional/test_s3.py::test_put_bucket_logging_policy_wildcard
191+
s3tests_boto3/functional/test_s3.py::test_put_bucket_logging_policy_wildcard_objects
192+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_permission_change_s
193+
s3tests_boto3/functional/test_s3.py::test_put_bucket_logging_tenant_s
194+
s3tests_boto3/functional/test_s3.py::test_put_bucket_logging_account_s
195+
s3tests_boto3/functional/test_s3.py::test_rm_bucket_logging
196+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_put_objects
197+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_put_objects_versioned
198+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_put_concurrency
199+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_delete_objects
200+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_delete_objects_versioned
201+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_get_objects
202+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_get_objects_versioned
203+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_copy_objects
204+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_copy_objects_versioned
205+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_copy_objects_bucket
206+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_copy_objects_bucket_versioned
207+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_head_objects
208+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_head_objects_versioned
209+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_mpu_s
210+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_mpu_versioned_s
211+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_mpu_copy
212+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_mpu_copy_versioned
213+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_multi_delete
214+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_multi_delete_versioned
215+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_multiple_prefixes
216+
s3tests_boto3/functional/test_s3.py::test_bucket_logging_single_prefix
217+
s3tests_boto3/functional/test_s3.py::test_get_multipart_checksum_object_attributes
218+
s3tests_boto3/functional/test_s3.py::test_get_multipart_object_attributes
219+
s3tests_boto3/functional/test_s3.py::test_get_paginated_multipart_object_attributes
220+
s3tests_boto3/functional/test_s3.py::test_get_single_multipart_object_attributes
221+
s3tests_boto3/functional/test_s3.py::test_get_checksum_object_attributes
222+
s3tests_boto3/functional/test_s3.py::test_get_versioned_object_attributes
223+
s3tests_boto3/functional/test_s3.py::test_get_sse_c_encrypted_object_attributes
224+
s3tests_boto3/functional/test_s3.py::test_get_object_attributes
225+
s3tests_boto3/functional/test_s3.py::test_upload_part_copy_percent_encoded_key
226+
s3tests_boto3/functional/test_s3.py::test_delete_marker_nonversioned
227+
s3tests_boto3/functional/test_s3.py::test_delete_marker_versioned
228+
s3tests_boto3/functional/test_s3.py::test_delete_marker_suspended
229+
s3tests_boto3/functional/test_s3.py::test_delete_marker_expiration

‎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) {

‎src/test/external_tests/ceph_s3_tests/test_ceph_s3_config.conf

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,14 @@ ssl_verify = False
1919
## the prefix to 30 characters long, and avoid collisions
2020
bucket prefix = ceph-{random}-
2121

22+
# all the iam account resources (users, roles, etc) created
23+
# will start with this name prefix
24+
iam name prefix = s3-tests-
25+
26+
# all the iam account resources (users, roles, etc) created
27+
# will start with this path prefix
28+
iam path prefix = /s3-tests/
29+
2230
[s3 main]
2331
## the tests assume two accounts are defined, "main" and "alt".
2432
email = main.alt@noobaa.com
@@ -51,9 +59,47 @@ secret_key = tenant_secret_key
5159
# tenant email set in vstart.sh
5260
email = ceph.tenant@noobaa.com
5361

62+
# tenant name
63+
tenant = testx
64+
5465
[s3 alt]
5566
## another user account, used for ACL-related tests
5667
user_id = 56789abcdef0123456789abcdef0123456789abcdef0123456789abcdef01234
5768
display_name = cephalt
5869
## the "alt" user needs to have email set, too
5970
email = ceph.alt@noobaa.com
71+
## replace these with your access keys
72+
access_key = s3_access_key
73+
secret_key = s3_secret_key
74+
75+
#following section needs to be added for all sts-tests
76+
[iam]
77+
#used for iam operations in sts-tests
78+
#email from vstart.sh
79+
email = ceph.alt@noobaa.com
80+
81+
#user_id from vstart.sh
82+
user_id = 56789abcdef0123456789abcdef0123456789abcdef0123456789abcdef01234
83+
84+
#access_key from vstart.sh
85+
access_key = tenant_access_key
86+
87+
#secret_key vstart.sh
88+
secret_key = tenant_secret_key
89+
90+
#display_name from vstart.sh
91+
display_name = cephalt
92+
93+
# iam account root user for iam_account tests
94+
[iam root]
95+
access_key = tenant_access_key
96+
secret_key = tenant_secret_key
97+
user_id = 0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
98+
email = main.alt@noobaa.com
99+
100+
# iam account root user in a different account than [iam root]
101+
[iam alt root]
102+
access_key = tenant_access_key
103+
secret_key = tenant_secret_key
104+
user_id = 56789abcdef0123456789abcdef0123456789abcdef0123456789abcdef01234
105+
email = ceph.alt@noobaa.com

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,13 @@ async function ceph_test_setup() {
8787

8888
console.info('CEPH TEST CONFIGURATION:', JSON.stringify(CEPH_TEST));
8989
const { access_key, secret_key } = ceph_account.access_keys[0];
90-
await os_utils.exec(`echo access_key = ${access_key.unwrap()} >> ${CEPH_TEST.test_dir}${CEPH_TEST.ceph_config}`);
91-
await os_utils.exec(`echo secret_key = ${secret_key.unwrap()} >> ${CEPH_TEST.test_dir}${CEPH_TEST.ceph_config}`);
92-
9390
const { access_key: access_key_tenant, secret_key: secret_key_tenant } = ceph_account_tenant.access_keys[0];
91+
9492
if (os_utils.IS_MAC) {
9593
await os_utils.exec(`sed -i "" "s|tenant_access_key|${access_key_tenant.unwrap()}|g" ${CEPH_TEST.test_dir}${CEPH_TEST.ceph_config}`);
9694
await os_utils.exec(`sed -i "" "s|tenant_secret_key|${secret_key_tenant.unwrap()}|g" ${CEPH_TEST.test_dir}${CEPH_TEST.ceph_config}`);
95+
await os_utils.exec(`sed -i "" "s|s3_access_key|${access_key.unwrap()}|g" ${CEPH_TEST.test_dir}${CEPH_TEST.ceph_config}`);
96+
await os_utils.exec(`sed -i "" "s|s3_secret_key|${secret_key.unwrap()}|g" ${CEPH_TEST.test_dir}${CEPH_TEST.ceph_config}`);
9797

9898
} else {
9999
await os_utils.exec(`sed -i -e 's:tenant_access_key:${access_key_tenant.unwrap()}:g' ${CEPH_TEST.test_dir}${CEPH_TEST.ceph_config}`);

‎src/test/external_tests/ceph_s3_tests/test_ceph_s3_deploy.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ DIRECTORY="s3-tests"
1717
CEPH_LINK="https://github.com/ceph/s3-tests.git"
1818
# using a fixed version (commit) of ceph tests to avoid sudden changes.
1919
# we should retest and update the version once in a while
20-
CEPH_TESTS_VERSION=88fd8670072cf4b7559908419c67cfaaca02c794
20+
CEPH_TESTS_VERSION=aafacab2017bec1dd1ce3159105455bb7e9447b1
2121
if [ ! -d $DIRECTORY ]; then
2222
echo "Downloading Ceph S3 Tests..."
2323
git clone $CEPH_LINK

0 commit comments

Comments
 (0)