From: Yuri Weinstein <yuri.weinstein@inktank.com>
Date: Fri, 1 May 2015 18:04:59 +0000 (-0700)
Subject: Removed redundant tests issue #11520
X-Git-Tag: v10.2.6~165^2^2~482^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f99bc7cc06f2b13c38cf4fc3aa4b4b247ccfe168;p=ceph.git

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 549ad9e9d66b..c9325cecd6f3 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 13d05fa65f33..519e7d2566dc 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 e69de29bb2d1..000000000000
diff --git a/suites/ceph-deploy/rbd/ceph-deploy-overrides b/suites/ceph-deploy/rbd/ceph-deploy-overrides
deleted file mode 120000
index 3954c75a7891..000000000000
--- 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 50bcdbe600e1..000000000000
--- 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 c5d59352cb5e..000000000000
--- 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 89cf1acea431..000000000000
--- 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 e69de29bb2d1..000000000000
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 a03db6f4dbd0..000000000000
--- 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 3954c75a7891..000000000000
--- 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 50bcdbe600e1..000000000000
--- 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 c5d59352cb5e..000000000000
--- a/suites/ceph-deploy/singleton/distros
+++ /dev/null
@@ -1 +0,0 @@
-../../../distros/supported
\ No newline at end of file