qa/suites/rados/basic: factor out cluster start

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

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

diff --git a/qa/suites/rados/basic/tasks/rados_api_tests.yaml b/qa/suites/rados/basic/tasks/rados_api_tests.yaml
index acfc597dec3b632c8d5aa28a06318033a72801d0..b66423988d7cf17dd08d9b772c9809e3c3522111 100644 (file)
--- a/qa/suites/rados/basic/tasks/rados_api_tests.yaml
+++ b/qa/suites/rados/basic/tasks/rados_api_tests.yaml
@@ -4,8 +4,6 @@ overrides:
     - reached quota
     - wrongly marked me down
 tasks:
-- install:
-- ceph:
 - workunit:
     clients:
       client.0:

diff --git a/qa/suites/rados/basic/tasks/rados_cls_all.yaml b/qa/suites/rados/basic/tasks/rados_cls_all.yaml
index 8cc5479b27305fc6b3213e6bab00350075f4cefe..bbab083e9cd727d5e3ca86a828ce9fcf6d153e0d 100644 (file)
--- a/qa/suites/rados/basic/tasks/rados_cls_all.yaml
+++ b/qa/suites/rados/basic/tasks/rados_cls_all.yaml
@@ -7,8 +7,6 @@ overrides:
         osd_class_default_list: "cephfs hello journal lock log numops rbd refcount 
                                  replica_log rgw sdk statelog timeindex user version"
 tasks:
-- install:
-- ceph:
 - workunit:
     clients:
       client.0:

diff --git a/qa/suites/rados/basic/tasks/rados_python.yaml b/qa/suites/rados/basic/tasks/rados_python.yaml
index 00320538ff79ceeb58a3b0d666c0de97a5b66c7f..d8b332b343dc6dbe70c20c6c5d318757de9ff197 100644 (file)
--- a/qa/suites/rados/basic/tasks/rados_python.yaml
+++ b/qa/suites/rados/basic/tasks/rados_python.yaml
@@ -1,8 +1,8 @@
-tasks:
-- install:
-- ceph:
+overrides:
+  ceph:
     log-whitelist:
     - wrongly marked me down
+tasks:
 - workunit:
     clients:
       client.0:

diff --git a/qa/suites/rados/basic/tasks/rados_stress_watch.yaml b/qa/suites/rados/basic/tasks/rados_stress_watch.yaml
index ae2e5fd00832ab66b2180dc6850decc518768ab2..0e1ba010c5b4e808ade807b3d7b6b77ce40b4e5e 100644 (file)
--- a/qa/suites/rados/basic/tasks/rados_stress_watch.yaml
+++ b/qa/suites/rados/basic/tasks/rados_stress_watch.yaml
@@ -1,6 +1,4 @@
 tasks:
-- install:
-- ceph:
 - workunit:
     clients:
       client.0:

diff --git a/qa/suites/rados/basic/tasks/rados_striper.yaml b/qa/suites/rados/basic/tasks/rados_striper.yaml
index 8537fcbd4db47eba3d686963247666b614cc0913..c19cc83a93b94b569bbaf2359d6efd964c50e0ca 100644 (file)
--- a/qa/suites/rados/basic/tasks/rados_striper.yaml
+++ b/qa/suites/rados/basic/tasks/rados_striper.yaml
@@ -1,6 +1,4 @@
 tasks:
-- install:
-- ceph:
 - exec:
    client.0:
    - ceph_test_rados_striper_api_io

diff --git a/qa/suites/rados/basic/tasks/rados_workunit_loadgen_big.yaml b/qa/suites/rados/basic/tasks/rados_workunit_loadgen_big.yaml
index 9432367e35677831bcedc9f740ab16d3645f0410..fa928d1206347cbc4f82ed43ccc1e9cc6a753239 100644 (file)
--- a/qa/suites/rados/basic/tasks/rados_workunit_loadgen_big.yaml
+++ b/qa/suites/rados/basic/tasks/rados_workunit_loadgen_big.yaml
@@ -3,8 +3,6 @@ overrides:
     log-whitelist:
     - wrongly marked me down
 tasks:
-- install:
-- ceph:
 - workunit:
     clients:
       all:

diff --git a/qa/suites/rados/basic/tasks/rados_workunit_loadgen_mix.yaml b/qa/suites/rados/basic/tasks/rados_workunit_loadgen_mix.yaml
index 7d882cac9c99b034b29eb82f2bda0defe69d9d73..35d8fdaf11ff749b118865e7f629f6031f72cdf7 100644 (file)
--- a/qa/suites/rados/basic/tasks/rados_workunit_loadgen_mix.yaml
+++ b/qa/suites/rados/basic/tasks/rados_workunit_loadgen_mix.yaml
@@ -3,8 +3,6 @@ overrides:
     log-whitelist:
     - wrongly marked me down
 tasks:
-- install:
-- ceph:
 - workunit:
     clients:
       all:

diff --git a/qa/suites/rados/basic/tasks/rados_workunit_loadgen_mostlyread.yaml b/qa/suites/rados/basic/tasks/rados_workunit_loadgen_mostlyread.yaml
index 69c06b7b049bb89819857b7a705d3663a89bda6f..b3af2a2cac30c2cb328bf9b6210fc752c83e5f00 100644 (file)
--- a/qa/suites/rados/basic/tasks/rados_workunit_loadgen_mostlyread.yaml
+++ b/qa/suites/rados/basic/tasks/rados_workunit_loadgen_mostlyread.yaml
@@ -3,8 +3,6 @@ overrides:
     log-whitelist:
     - wrongly marked me down
 tasks:
-- install:
-- ceph:
 - workunit:
     clients:
       all:

diff --git a/qa/suites/rados/basic/tasks/readwrite.yaml b/qa/suites/rados/basic/tasks/readwrite.yaml
index 38343f316eb7024a365b5db8d95a7a7dea075068..2ab9b28f94972fd6e1f7b9608e20e285ce9de2c9 100644 (file)
--- a/qa/suites/rados/basic/tasks/readwrite.yaml
+++ b/qa/suites/rados/basic/tasks/readwrite.yaml
@@ -5,8 +5,6 @@ overrides:
       osd:
         osd_discard_disconnected_ops: false
 tasks:
-- install:
-- ceph:
 - rados:
     clients: [client.0]
     ops: 4000

diff --git a/qa/suites/rados/basic/tasks/repair_test.yaml b/qa/suites/rados/basic/tasks/repair_test.yaml
index 609f0db6211db663cd7311fb26cf69a95224a088..bd98522d1e0aa2ff8864945f5efdb2aa3d0d46a8 100644 (file)
--- a/qa/suites/rados/basic/tasks/repair_test.yaml
+++ b/qa/suites/rados/basic/tasks/repair_test.yaml
@@ -21,7 +21,5 @@ overrides:
         filestore debug inject read err: true
         bluestore debug inject read err: true
 tasks:
-- install:
-- ceph:
 - repair_test:
 

diff --git a/qa/suites/rados/basic/tasks/rgw_snaps.yaml b/qa/suites/rados/basic/tasks/rgw_snaps.yaml
index 3e7745aec2af0626c9e4d37efcf96943d016b30a..135db06b8ea3524abd3e931b392e987c51a60df8 100644 (file)
--- a/qa/suites/rados/basic/tasks/rgw_snaps.yaml
+++ b/qa/suites/rados/basic/tasks/rgw_snaps.yaml
@@ -7,8 +7,6 @@ overrides:
       osd:
         osd_max_omap_entries_per_request: 10
 tasks:
-- install:
-- ceph:
 - rgw:
     default_idle_timeout: 3600
     client.0: null

diff --git a/qa/suites/rados/basic/tasks/scrub_test.yaml b/qa/suites/rados/basic/tasks/scrub_test.yaml
index 3b3b69dfad394678e0953778e8da6c32bade064b..1847f80d46b11c0ad03546ac50db6c9aa845f7fa 100644 (file)
--- a/qa/suites/rados/basic/tasks/scrub_test.yaml
+++ b/qa/suites/rados/basic/tasks/scrub_test.yaml
@@ -18,6 +18,4 @@ overrides:
       osd:
         osd deep scrub update digest min age: 0
 tasks:
-- install:
-- ceph:
 - scrub_test: