From dcfd6a3b099fd0e14fbfd47a8678a411387e01da Mon Sep 17 00:00:00 2001 From: Yuri Weinstein Date: Thu, 7 May 2015 17:42:31 -0700 Subject: [PATCH] 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 --- suites/ceph-deploy/{fs => basic}/% | 0 .../{fs => basic}/ceph-deploy-overrides | 0 .../ceph-deploy/{fs => basic}/config_options | 0 suites/ceph-deploy/{fs => basic}/distros | 0 .../tasks/ceph-deploy_hello_world.yaml} | 4 +-- .../cfuse_workunit_suites_blogbench.yaml | 32 ------------------- suites/ceph-deploy/rados/% | 0 .../ceph-deploy/rados/ceph-deploy-overrides | 1 - suites/ceph-deploy/rados/config_options | 1 - suites/ceph-deploy/rados/distros | 1 - 10 files changed, 2 insertions(+), 37 deletions(-) rename suites/ceph-deploy/{fs => basic}/% (100%) rename suites/ceph-deploy/{fs => basic}/ceph-deploy-overrides (100%) rename suites/ceph-deploy/{fs => basic}/config_options (100%) rename suites/ceph-deploy/{fs => basic}/distros (100%) rename suites/ceph-deploy/{rados/tasks/rados_api_tests.yaml => basic/tasks/ceph-deploy_hello_world.yaml} (78%) delete mode 100644 suites/ceph-deploy/fs/tasks/cfuse_workunit_suites_blogbench.yaml delete mode 100644 suites/ceph-deploy/rados/% delete mode 120000 suites/ceph-deploy/rados/ceph-deploy-overrides delete mode 120000 suites/ceph-deploy/rados/config_options delete mode 120000 suites/ceph-deploy/rados/distros diff --git a/suites/ceph-deploy/fs/% b/suites/ceph-deploy/basic/% similarity index 100% rename from suites/ceph-deploy/fs/% rename to suites/ceph-deploy/basic/% diff --git a/suites/ceph-deploy/fs/ceph-deploy-overrides b/suites/ceph-deploy/basic/ceph-deploy-overrides similarity index 100% rename from suites/ceph-deploy/fs/ceph-deploy-overrides rename to suites/ceph-deploy/basic/ceph-deploy-overrides diff --git a/suites/ceph-deploy/fs/config_options b/suites/ceph-deploy/basic/config_options similarity index 100% rename from suites/ceph-deploy/fs/config_options rename to suites/ceph-deploy/basic/config_options diff --git a/suites/ceph-deploy/fs/distros b/suites/ceph-deploy/basic/distros similarity index 100% rename from suites/ceph-deploy/fs/distros rename to suites/ceph-deploy/basic/distros diff --git a/suites/ceph-deploy/rados/tasks/rados_api_tests.yaml b/suites/ceph-deploy/basic/tasks/ceph-deploy_hello_world.yaml similarity index 78% rename from suites/ceph-deploy/rados/tasks/rados_api_tests.yaml rename to suites/ceph-deploy/basic/tasks/ceph-deploy_hello_world.yaml index 519e7d2566dc5..78dea03d84123 100644 --- a/suites/ceph-deploy/rados/tasks/rados_api_tests.yaml +++ b/suites/ceph-deploy/basic/tasks/ceph-deploy_hello_world.yaml @@ -25,5 +25,5 @@ tasks: - workunit: clients: client.0: - - rados/test.sh -- print: "**** done rados/test.sh" + - ceph-deploy/ceph-deploy_hello_world.sh +- print: "**** done ceph-deploy/ceph-deploy_hello_world.sh" 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 c9325cecd6f3b..0000000000000 --- 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 e69de29bb2d1d..0000000000000 diff --git a/suites/ceph-deploy/rados/ceph-deploy-overrides b/suites/ceph-deploy/rados/ceph-deploy-overrides deleted file mode 120000 index 3954c75a78919..0000000000000 --- 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 50bcdbe600e19..0000000000000 --- 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 c5d59352cb5ea..0000000000000 --- a/suites/ceph-deploy/rados/distros +++ /dev/null @@ -1 +0,0 @@ -../../../distros/supported \ No newline at end of file -- 2.39.5