From: Yuri Weinstein <yweinste@redhat.com>
Date: Fri, 8 May 2015 00:42:31 +0000 (-0700)
Subject: Replaced work units with ceph-deploy/ceph-deploy_hello_world.sh re: #11547
X-Git-Tag: v10.2.6~165^2^2~478^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dcfd6a3b099fd0e14fbfd47a8678a411387e01da;p=ceph.git

Replaced work units with ceph-deploy/ceph-deploy_hello_world.sh re: #11547
Removed per Josh's suggestion fs as redundant and renamed rados to bacis

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
---

diff --git a/suites/ceph-deploy/basic/% b/suites/ceph-deploy/basic/%
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/suites/ceph-deploy/basic/ceph-deploy-overrides b/suites/ceph-deploy/basic/ceph-deploy-overrides
new file mode 120000
index 000000000000..3954c75a7891
--- /dev/null
+++ b/suites/ceph-deploy/basic/ceph-deploy-overrides
@@ -0,0 +1 @@
+../../../ceph-deploy-overrides
\ No newline at end of file
diff --git a/suites/ceph-deploy/basic/config_options b/suites/ceph-deploy/basic/config_options
new file mode 120000
index 000000000000..50bcdbe600e1
--- /dev/null
+++ b/suites/ceph-deploy/basic/config_options
@@ -0,0 +1 @@
+../../../config_options
\ No newline at end of file
diff --git a/suites/ceph-deploy/basic/distros b/suites/ceph-deploy/basic/distros
new file mode 120000
index 000000000000..c5d59352cb5e
--- /dev/null
+++ b/suites/ceph-deploy/basic/distros
@@ -0,0 +1 @@
+../../../distros/supported
\ No newline at end of file
diff --git a/suites/ceph-deploy/basic/tasks/ceph-deploy_hello_world.yaml b/suites/ceph-deploy/basic/tasks/ceph-deploy_hello_world.yaml
new file mode 100644
index 000000000000..78dea03d8412
--- /dev/null
+++ b/suites/ceph-deploy/basic/tasks/ceph-deploy_hello_world.yaml
@@ -0,0 +1,29 @@
+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
+  - 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:
+           - ceph-deploy/ceph-deploy_hello_world.sh
+- print: "**** done ceph-deploy/ceph-deploy_hello_world.sh"
diff --git a/suites/ceph-deploy/fs/% b/suites/ceph-deploy/fs/%
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/suites/ceph-deploy/fs/ceph-deploy-overrides b/suites/ceph-deploy/fs/ceph-deploy-overrides
deleted file mode 120000
index 3954c75a7891..000000000000
--- a/suites/ceph-deploy/fs/ceph-deploy-overrides
+++ /dev/null
@@ -1 +0,0 @@
-../../../ceph-deploy-overrides
\ No newline at end of file
diff --git a/suites/ceph-deploy/fs/config_options b/suites/ceph-deploy/fs/config_options
deleted file mode 120000
index 50bcdbe600e1..000000000000
--- a/suites/ceph-deploy/fs/config_options
+++ /dev/null
@@ -1 +0,0 @@
-../../../config_options
\ No newline at end of file
diff --git a/suites/ceph-deploy/fs/distros b/suites/ceph-deploy/fs/distros
deleted file mode 120000
index c5d59352cb5e..000000000000
--- a/suites/ceph-deploy/fs/distros
+++ /dev/null
@@ -1 +0,0 @@
-../../../distros/supported
\ No newline at end of file
diff --git a/suites/ceph-deploy/fs/tasks/cfuse_workunit_suites_blogbench.yaml b/suites/ceph-deploy/fs/tasks/cfuse_workunit_suites_blogbench.yaml
deleted file mode 100644
index c9325cecd6f3..000000000000
--- a/suites/ceph-deploy/fs/tasks/cfuse_workunit_suites_blogbench.yaml
+++ /dev/null
@@ -1,32 +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
-  - client.0
-tasks:
-- install:
-     extras: yes
-- print: "**** done install extras"
-- ssh_keys:
-- print: "**** done ssh_keys"
-- ceph-deploy:
-- print: "**** done ceph-deploy"
-- ceph-fuse:
-- print: "**** done ceph-fuse"
-- workunit:
-     clients:
-        client.0:
-           - suites/blogbench.sh
-- print: "**** done suites/blogbench.sh"
-exclude_arch: armv7l
diff --git a/suites/ceph-deploy/rados/% b/suites/ceph-deploy/rados/%
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/suites/ceph-deploy/rados/ceph-deploy-overrides b/suites/ceph-deploy/rados/ceph-deploy-overrides
deleted file mode 120000
index 3954c75a7891..000000000000
--- a/suites/ceph-deploy/rados/ceph-deploy-overrides
+++ /dev/null
@@ -1 +0,0 @@
-../../../ceph-deploy-overrides
\ No newline at end of file
diff --git a/suites/ceph-deploy/rados/config_options b/suites/ceph-deploy/rados/config_options
deleted file mode 120000
index 50bcdbe600e1..000000000000
--- a/suites/ceph-deploy/rados/config_options
+++ /dev/null
@@ -1 +0,0 @@
-../../../config_options
\ No newline at end of file
diff --git a/suites/ceph-deploy/rados/distros b/suites/ceph-deploy/rados/distros
deleted file mode 120000
index c5d59352cb5e..000000000000
--- a/suites/ceph-deploy/rados/distros
+++ /dev/null
@@ -1 +0,0 @@
-../../../distros/supported
\ No newline at end of file
diff --git a/suites/ceph-deploy/rados/tasks/rados_api_tests.yaml b/suites/ceph-deploy/rados/tasks/rados_api_tests.yaml
deleted file mode 100644
index 519e7d2566dc..000000000000
--- a/suites/ceph-deploy/rados/tasks/rados_api_tests.yaml
+++ /dev/null
@@ -1,29 +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
-  - 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:
-           - rados/test.sh
-- print: "**** done rados/test.sh"