From 002d45b589964d44843cfdf8b69e8582d2d30075 Mon Sep 17 00:00:00 2001 From: Xiubo Li Date: Tue, 31 Jan 2023 11:09:16 +0800 Subject: [PATCH] qa: add ceph.exclude file to exclude individual tests Skip some tests, which will take to much time or will fail, for now. Signed-off-by: Xiubo Li --- qa/tasks/cephfs/xfstests_dev.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/qa/tasks/cephfs/xfstests_dev.py b/qa/tasks/cephfs/xfstests_dev.py index 31d322723af..a032272df27 100644 --- a/qa/tasks/cephfs/xfstests_dev.py +++ b/qa/tasks/cephfs/xfstests_dev.py @@ -1,5 +1,8 @@ from io import StringIO from logging import getLogger +from os.path import join +from textwrap import dedent + from tasks.cephfs.cephfs_test_case import CephFSTestCase @@ -29,6 +32,7 @@ class XFSTestsDev(CephFSTestCase): self.install_deps() self.create_reqd_users() self.write_local_config() + self.write_ceph_exclude() # NOTE: On teuthology machines it's necessary to run "make" as # superuser since the repo is cloned somewhere in /tmp. @@ -82,7 +86,6 @@ class XFSTestsDev(CephFSTestCase): and "scratch" directories would be mounted. Look at xfstests-dev local.config's template inside this file to get some context. """ - from os.path import join self.test_dirname = 'test' self.mount_a.run_shell(['mkdir', self.test_dirname]) @@ -161,9 +164,6 @@ class XFSTestsDev(CephFSTestCase): check_status=False) def write_local_config(self): - from os.path import join - from textwrap import dedent - 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 @@ -181,6 +181,16 @@ class XFSTestsDev(CephFSTestCase): self.mount_a.client_remote.write_file(join(self.xfstests_repo_path, 'local.config'), xfstests_config_contents, sudo=True) + def write_ceph_exclude(self): + # These tests will fail or take too much time and will + # make the test timedout, just skip them for now. + xfstests_exclude_contents = dedent('''\ + {c}/001 {g}/003 {g}/020 {g}/075 {g}/317 {g}/538 {g}/531 + ''').format(g="generic", c="ceph") + + self.mount_a.client_remote.write_file(join(self.xfstests_repo_path, 'ceph.exclude'), + xfstests_exclude_contents, sudo=True) + def tearDown(self): self.mount_a.client_remote.run(args=['sudo', 'userdel', '--force', '--remove', 'fsgqa'], -- 2.39.5