Update commit hash in ceph tests

Signed-off-by: Aayush <aayush@li-2392f9cc-287a-11b2-a85c-9fcc04b05da6.ibm.com>

Author: Aayush

src/test/external_tests/ceph_s3_tests/test_ceph_s3_config.conf

@@ -19,6 +19,14 @@ ssl_verify = False
 ## the prefix to 30 characters long, and avoid collisions
 bucket prefix = ceph-{random}-
 
+# all the iam account resources (users, roles, etc) created
+# will start with this name prefix
+iam name prefix = s3-tests-
+
+# all the iam account resources (users, roles, etc) created
+# will start with this path prefix
+iam path prefix = /s3-tests/
+
 [s3 main]
 ## the tests assume two accounts are defined, "main" and "alt".
 email = main.alt@noobaa.com
@@ -51,9 +59,47 @@ secret_key = tenant_secret_key
 # tenant email set in vstart.sh
 email = ceph.tenant@noobaa.com
 
+# tenant name
+tenant = testx
+
 [s3 alt]
 ## another user account, used for ACL-related tests
 user_id = 56789abcdef0123456789abcdef0123456789abcdef0123456789abcdef01234
 display_name = cephalt
 ## the "alt" user needs to have email set, too
 email = ceph.alt@noobaa.com
+## replace these with your access keys
+access_key = s3_access_key
+secret_key = s3_secret_key
+
+#following section needs to be added for all sts-tests
+[iam]
+#used for iam operations in sts-tests
+#email from vstart.sh
+email = ceph.alt@noobaa.com
+
+#user_id from vstart.sh
+user_id = 56789abcdef0123456789abcdef0123456789abcdef0123456789abcdef01234
+
+#access_key from vstart.sh
+access_key = tenant_access_key
+
+#secret_key vstart.sh
+secret_key = tenant_secret_key
+
+#display_name from vstart.sh
+display_name = cephalt
+
+# iam account root user for iam_account tests
+[iam root]
+access_key = tenant_access_key
+secret_key = tenant_secret_key
+user_id = 0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
+email = main.alt@noobaa.com
+
+# iam account root user in a different account than [iam root]
+[iam alt root]
+access_key = tenant_access_key
+secret_key = tenant_secret_key
+user_id = 56789abcdef0123456789abcdef0123456789abcdef0123456789abcdef01234
+email = ceph.alt@noobaa.com

src/test/external_tests/ceph_s3_tests/test_ceph_s3_config_setup.js

@@ -87,13 +87,13 @@ async function ceph_test_setup() {
 
     console.info('CEPH TEST CONFIGURATION:', JSON.stringify(CEPH_TEST));
     const { access_key, secret_key } = ceph_account.access_keys[0];
-    await os_utils.exec(`echo access_key = ${access_key.unwrap()} >> ${CEPH_TEST.test_dir}${CEPH_TEST.ceph_config}`);
-    await os_utils.exec(`echo secret_key = ${secret_key.unwrap()} >> ${CEPH_TEST.test_dir}${CEPH_TEST.ceph_config}`);
-
     const { access_key: access_key_tenant, secret_key: secret_key_tenant } = ceph_account_tenant.access_keys[0];
+
     if (os_utils.IS_MAC) {
         await os_utils.exec(`sed -i "" "s|tenant_access_key|${access_key_tenant.unwrap()}|g" ${CEPH_TEST.test_dir}${CEPH_TEST.ceph_config}`);
         await os_utils.exec(`sed -i "" "s|tenant_secret_key|${secret_key_tenant.unwrap()}|g" ${CEPH_TEST.test_dir}${CEPH_TEST.ceph_config}`);
+        await os_utils.exec(`sed -i "" "s|s3_access_key|${access_key.unwrap()}|g" ${CEPH_TEST.test_dir}${CEPH_TEST.ceph_config}`);
+        await os_utils.exec(`sed -i "" "s|s3_secret_key|${secret_key.unwrap()}|g" ${CEPH_TEST.test_dir}${CEPH_TEST.ceph_config}`);
 
     } else {
         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

@@ -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=88fd8670072cf4b7559908419c67cfaaca02c794
+CEPH_TESTS_VERSION=aafacab2017bec1dd1ce3159105455bb7e9447b1
 if [ ! -d $DIRECTORY ]; then
     echo "Downloading Ceph S3 Tests..."
     git clone $CEPH_LINK