From: Xiubo Li Date: Tue, 31 Jan 2023 13:58:39 +0000 (+0800) Subject: qa: add 'options' parameter support for write_local_config X-Git-Tag: v18.1.0~320^2~1 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=306b8bea4a0ce3847fa83c8ced571c8d08d950a2;p=ceph.git qa: add 'options' parameter support for write_local_config This will allow the fscrypt test case to add dedicated options. Signed-off-by: Xiubo Li --- diff --git a/qa/tasks/cephfs/xfstests_dev.py b/qa/tasks/cephfs/xfstests_dev.py index a032272df2775..f606f645ef228 100644 --- a/qa/tasks/cephfs/xfstests_dev.py +++ b/qa/tasks/cephfs/xfstests_dev.py @@ -163,7 +163,9 @@ class XFSTestsDev(CephFSTestCase): '123456-fsgqa'], omit_sudo=False, check_status=False) - def write_local_config(self): + def write_local_config(self, options=None): + _options = '' if not options else ',' + options + mon_sock = self.fs.mon_manager.get_msgrv1_mon_socks()[0] self.test_dev = mon_sock + ':/' + self.test_dirname self.scratch_dev = mon_sock + ':/' + self.scratch_dirname @@ -174,9 +176,9 @@ class XFSTestsDev(CephFSTestCase): export TEST_DIR={} export SCRATCH_DEV={} export SCRATCH_MNT={} - export CEPHFS_MOUNT_OPTIONS="-o name=admin,secret={}" + export CEPHFS_MOUNT_OPTIONS="-o name=admin,secret={}{}" ''').format(self.test_dev, self.test_dirs_mount_path, self.scratch_dev, - self.scratch_dirs_mount_path, self.get_admin_key()) + self.scratch_dirs_mount_path, self.get_admin_key(), _options) self.mount_a.client_remote.write_file(join(self.xfstests_repo_path, 'local.config'), xfstests_config_contents, sudo=True)