From fa27c2b283d5602ce01bb749be337f0ad83a42eb Mon Sep 17 00:00:00 2001 From: Yuri Weinstein Date: Fri, 1 May 2015 11:04:59 -0700 Subject: [PATCH] Removed redundant tests issue #11520 Reduced nodes to be locked to two Signed-off-by: Yuri Weinstein (cherry picked from commit 8ab46b42c5ae387141917bb8eff35960e9c45699) --- .../cfuse_workunit_suites_blogbench.yaml | 2 -- .../rados/tasks/rados_api_tests.yaml | 2 -- suites/ceph-deploy/rbd/% | 0 suites/ceph-deploy/rbd/ceph-deploy-overrides | 1 - suites/ceph-deploy/rbd/config_options | 1 - suites/ceph-deploy/rbd/distros | 1 - .../rbd/tasks/rbd_python_api_tests.yaml | 31 ------------------- suites/ceph-deploy/singleton/% | 0 .../ceph-deploy/singleton/all/basic-test.yaml | 31 ------------------- .../singleton/ceph-deploy-overrides | 1 - suites/ceph-deploy/singleton/config_options | 1 - suites/ceph-deploy/singleton/distros | 1 - 12 files changed, 72 deletions(-) delete mode 100644 suites/ceph-deploy/rbd/% delete mode 120000 suites/ceph-deploy/rbd/ceph-deploy-overrides delete mode 120000 suites/ceph-deploy/rbd/config_options delete mode 120000 suites/ceph-deploy/rbd/distros delete mode 100644 suites/ceph-deploy/rbd/tasks/rbd_python_api_tests.yaml delete mode 100644 suites/ceph-deploy/singleton/% delete mode 100644 suites/ceph-deploy/singleton/all/basic-test.yaml delete mode 120000 suites/ceph-deploy/singleton/ceph-deploy-overrides delete mode 120000 suites/ceph-deploy/singleton/config_options delete mode 120000 suites/ceph-deploy/singleton/distros diff --git a/suites/ceph-deploy/fs/tasks/cfuse_workunit_suites_blogbench.yaml b/suites/ceph-deploy/fs/tasks/cfuse_workunit_suites_blogbench.yaml index 549ad9e9d66b1..c9325cecd6f3b 100644 --- a/suites/ceph-deploy/fs/tasks/cfuse_workunit_suites_blogbench.yaml +++ b/suites/ceph-deploy/fs/tasks/cfuse_workunit_suites_blogbench.yaml @@ -13,8 +13,6 @@ roles: - osd.0 - - osd.1 - mon.b -- - mon.c - - osd.2 - client.0 tasks: - install: diff --git a/suites/ceph-deploy/rados/tasks/rados_api_tests.yaml b/suites/ceph-deploy/rados/tasks/rados_api_tests.yaml index 13d05fa65f33a..519e7d2566dc5 100644 --- a/suites/ceph-deploy/rados/tasks/rados_api_tests.yaml +++ b/suites/ceph-deploy/rados/tasks/rados_api_tests.yaml @@ -13,8 +13,6 @@ roles: - osd.0 - - osd.1 - mon.b -- - mon.c - - osd.2 - client.0 tasks: - install: diff --git a/suites/ceph-deploy/rbd/% b/suites/ceph-deploy/rbd/% deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/suites/ceph-deploy/rbd/ceph-deploy-overrides b/suites/ceph-deploy/rbd/ceph-deploy-overrides deleted file mode 120000 index 3954c75a78919..0000000000000 --- a/suites/ceph-deploy/rbd/ceph-deploy-overrides +++ /dev/null @@ -1 +0,0 @@ -../../../ceph-deploy-overrides \ No newline at end of file diff --git a/suites/ceph-deploy/rbd/config_options b/suites/ceph-deploy/rbd/config_options deleted file mode 120000 index 50bcdbe600e19..0000000000000 --- a/suites/ceph-deploy/rbd/config_options +++ /dev/null @@ -1 +0,0 @@ -../../../config_options \ No newline at end of file diff --git a/suites/ceph-deploy/rbd/distros b/suites/ceph-deploy/rbd/distros deleted file mode 120000 index c5d59352cb5ea..0000000000000 --- a/suites/ceph-deploy/rbd/distros +++ /dev/null @@ -1 +0,0 @@ -../../../distros/supported \ No newline at end of file diff --git a/suites/ceph-deploy/rbd/tasks/rbd_python_api_tests.yaml b/suites/ceph-deploy/rbd/tasks/rbd_python_api_tests.yaml deleted file mode 100644 index 89cf1acea4319..0000000000000 --- a/suites/ceph-deploy/rbd/tasks/rbd_python_api_tests.yaml +++ /dev/null @@ -1,31 +0,0 @@ -overrides: - ceph-deploy: - conf: - global: - debug ms: 1 - osd: - debug osd: 10 - mon: - debug mon: 10 -roles: -- - mon.a - - mds.0 - - osd.0 -- - osd.1 - - mon.b -- - mon.c - - osd.2 - - client.0 -tasks: -- install: - extras: yes -- print: "**** done install extras" -- ssh_keys: -- print: "**** done ssh_keys" -- ceph-deploy: -- print: "**** done ceph-deploy" -- workunit: - clients: - client.0: - - rbd/test_librbd_python.sh -- print: "**** done rbd/test_librbd_python.sh" diff --git a/suites/ceph-deploy/singleton/% b/suites/ceph-deploy/singleton/% deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/suites/ceph-deploy/singleton/all/basic-test.yaml b/suites/ceph-deploy/singleton/all/basic-test.yaml deleted file mode 100644 index a03db6f4dbd01..0000000000000 --- a/suites/ceph-deploy/singleton/all/basic-test.yaml +++ /dev/null @@ -1,31 +0,0 @@ -overrides: - ceph: - conf: - global: - debug ms: 1 - osd: - debug osd: 10 - mon: - debug mon: 10 -roles: -- - mon.a - - mds.0 - - osd.0 -- - osd.1 - - mon.b -- - mon.c - - osd.2 - - client.0 -tasks: -- install: - extras: yes -- print: "**** done install extras" -- ssh_keys: -- print: "**** done ssh_keys" -- ceph-deploy: -- print: "**** done ceph-deploy" -- workunit: - clients: - client.0: - - suites/blogbench.sh -- print: "**** done suites/blogbench.sh" diff --git a/suites/ceph-deploy/singleton/ceph-deploy-overrides b/suites/ceph-deploy/singleton/ceph-deploy-overrides deleted file mode 120000 index 3954c75a78919..0000000000000 --- a/suites/ceph-deploy/singleton/ceph-deploy-overrides +++ /dev/null @@ -1 +0,0 @@ -../../../ceph-deploy-overrides \ No newline at end of file diff --git a/suites/ceph-deploy/singleton/config_options b/suites/ceph-deploy/singleton/config_options deleted file mode 120000 index 50bcdbe600e19..0000000000000 --- a/suites/ceph-deploy/singleton/config_options +++ /dev/null @@ -1 +0,0 @@ -../../../config_options \ No newline at end of file diff --git a/suites/ceph-deploy/singleton/distros b/suites/ceph-deploy/singleton/distros deleted file mode 120000 index c5d59352cb5ea..0000000000000 --- a/suites/ceph-deploy/singleton/distros +++ /dev/null @@ -1 +0,0 @@ -../../../distros/supported \ No newline at end of file -- 2.39.5