Removed redundant tests issue #11520

Reduced nodes to be locked to two

Signed-off-by: Yuri Weinstein <yuri.weinstein@inktank.com>
(cherry picked from commit 8ab46b42c5ae387141917bb8eff35960e9c45699)

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 549ad9e9d66b1f59e6a6f754440f710389ecc120..c9325cecd6f3bda7b8d59605663aff0902e787ea 100644 (file)
--- 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 13d05fa65f33a3acf9c5dd91c142248a010c612a..519e7d2566dc526c6b8675786e330791df75d4b1 100644 (file)
--- 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 (file)
index e69de29..0000000

diff --git a/suites/ceph-deploy/rbd/ceph-deploy-overrides b/suites/ceph-deploy/rbd/ceph-deploy-overrides
deleted file mode 120000 (symlink)
index 3954c75..0000000
--- 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 (symlink)
index 50bcdbe..0000000
--- 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 (symlink)
index c5d5935..0000000
--- 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 (file)
index 89cf1ac..0000000
--- 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 (file)
index e69de29..0000000

diff --git a/suites/ceph-deploy/singleton/all/basic-test.yaml b/suites/ceph-deploy/singleton/all/basic-test.yaml
deleted file mode 100644 (file)
index a03db6f..0000000
--- 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 (symlink)
index 3954c75..0000000
--- 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 (symlink)
index 50bcdbe..0000000
--- 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 (symlink)
index c5d5935..0000000
--- a/suites/ceph-deploy/singleton/distros
+++ /dev/null
@@ -1 +0,0 @@
-../../../distros/supported
\ No newline at end of file