rbd/basic: factor out install + ceph

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/suites/rbd/basic/base/install.yaml b/suites/rbd/basic/base/install.yaml
new file mode 100644 (file)
index 0000000..2030acb
--- /dev/null
+++ b/suites/rbd/basic/base/install.yaml
@@ -0,0 +1,3 @@
+tasks:
+- install:
+- ceph:

diff --git a/suites/rbd/basic/tasks/rbd_api_tests_old_format.yaml b/suites/rbd/basic/tasks/rbd_api_tests_old_format.yaml
index f9e4110b57c371387f6d0c7b2d2508b449f4208c..a98768540ba97f9274a370ab5a0d106e66d66081 100644 (file)
--- a/suites/rbd/basic/tasks/rbd_api_tests_old_format.yaml
+++ b/suites/rbd/basic/tasks/rbd_api_tests_old_format.yaml
@@ -1,6 +1,4 @@
 tasks:
-- install:
-- ceph:
 - workunit:
     clients:
       client.0:

diff --git a/suites/rbd/basic/tasks/rbd_cli_copy.yaml b/suites/rbd/basic/tasks/rbd_cli_copy.yaml
index cb954edebb6db4866729c2d7b6d54c882fa38686..ae95e51e066ad76ded5ab39994e241d43dc04f7b 100644 (file)
--- a/suites/rbd/basic/tasks/rbd_cli_copy.yaml
+++ b/suites/rbd/basic/tasks/rbd_cli_copy.yaml
@@ -1,6 +1,4 @@
 tasks:
-- install:
-- ceph:
 - workunit:
     clients:
       client.0:

diff --git a/suites/rbd/basic/tasks/rbd_cli_copy_old_format.yaml b/suites/rbd/basic/tasks/rbd_cli_copy_old_format.yaml
index 3ca43192f9fc9d169c8744d5db84b2108f81a87a..2f99f8990deb6d4972c27a09f38111454bec103e 100644 (file)
--- a/suites/rbd/basic/tasks/rbd_cli_copy_old_format.yaml
+++ b/suites/rbd/basic/tasks/rbd_cli_copy_old_format.yaml
@@ -1,6 +1,4 @@
 tasks:
-- install:
-- ceph:
 - workunit:
     clients:
       client.0:

diff --git a/suites/rbd/basic/tasks/rbd_cli_import_export.yaml b/suites/rbd/basic/tasks/rbd_cli_import_export.yaml
index 5093e69ee3bc44ea3a45b10f9c5e127660a36587..49070827be09b67f5e55d4b36cc5c765e0f32703 100644 (file)
--- a/suites/rbd/basic/tasks/rbd_cli_import_export.yaml
+++ b/suites/rbd/basic/tasks/rbd_cli_import_export.yaml
@@ -1,6 +1,4 @@
 tasks:
-- install:
-- ceph:
 - workunit:
     clients:
       client.0:

diff --git a/suites/rbd/basic/tasks/rbd_cli_import_export_old_format.yaml b/suites/rbd/basic/tasks/rbd_cli_import_export_old_format.yaml
index 21fb494c18856b90efdca8b836f4e639d9d2018f..b08f2612f7af57e1830152fb813968b4bda48722 100644 (file)
--- a/suites/rbd/basic/tasks/rbd_cli_import_export_old_format.yaml
+++ b/suites/rbd/basic/tasks/rbd_cli_import_export_old_format.yaml
@@ -1,6 +1,4 @@
 tasks:
-- install:
-- ceph:
 - workunit:
     clients:
       client.0:

diff --git a/suites/rbd/basic/tasks/rbd_cli_tests.yaml b/suites/rbd/basic/tasks/rbd_cli_tests.yaml
index c66fefe8078c5a233f0fa95556bc1f56b6998867..a37db057b5d8968a35bf89486e3948aedf5c317e 100644 (file)
--- a/suites/rbd/basic/tasks/rbd_cli_tests.yaml
+++ b/suites/rbd/basic/tasks/rbd_cli_tests.yaml
@@ -1,6 +1,4 @@
 tasks:
-- install:
-- ceph:
 - workunit:
     clients:
       client.0:

diff --git a/suites/rbd/basic/tasks/rbd_cls_tests.yaml b/suites/rbd/basic/tasks/rbd_cls_tests.yaml
index 6a3c73f330fff8acd53586ae0f8f7cdbca5f502b..9ccd57c4a82a732dc4adf67a6c18508e7471d692 100644 (file)
--- a/suites/rbd/basic/tasks/rbd_cls_tests.yaml
+++ b/suites/rbd/basic/tasks/rbd_cls_tests.yaml
@@ -1,6 +1,4 @@
 tasks:
-- install:
-- ceph:
 - workunit:
     clients:
       client.0:

diff --git a/suites/rbd/basic/tasks/rbd_lock_and_fence.yaml b/suites/rbd/basic/tasks/rbd_lock_and_fence.yaml
index 961e1c17b7a8d39459286d4fa65bee5e1797ebad..d2c80ad6585fca439fe3ff1faf8c80c1e4bad075 100644 (file)
--- a/suites/rbd/basic/tasks/rbd_lock_and_fence.yaml
+++ b/suites/rbd/basic/tasks/rbd_lock_and_fence.yaml
@@ -1,6 +1,4 @@
 tasks:
-- install:
-- ceph:
 - workunit:
     clients:
       client.0:

diff --git a/suites/rbd/basic/tasks/rbd_python_api_tests_old_format.yaml b/suites/rbd/basic/tasks/rbd_python_api_tests_old_format.yaml
index 4d93e73d98455cd5335deb7ad362539fead64e83..263b784e27dd29c38cf45c6fc5ad2fae4fbb7214 100644 (file)
--- a/suites/rbd/basic/tasks/rbd_python_api_tests_old_format.yaml
+++ b/suites/rbd/basic/tasks/rbd_python_api_tests_old_format.yaml
@@ -1,6 +1,4 @@
 tasks:
-- install:
-- ceph:
 - workunit:
     clients:
       client.0: