From: Sage Weil <sage@redhat.com>
Date: Thu, 20 Apr 2017 14:00:22 +0000 (-0400)
Subject: qa/suites/rados/basic: factor out cluster start
X-Git-Tag: v12.0.3~28^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=112e232054a5fe3335b8cadf9b4593101611b5d7;p=ceph.git

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
index 000000000000..2030acb90836
--- /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 acfc597dec3b..b66423988d7c 100644
--- 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 8cc5479b2730..bbab083e9cd7 100644
--- 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 00320538ff79..d8b332b343dc 100644
--- 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 ae2e5fd00832..0e1ba010c5b4 100644
--- 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 8537fcbd4db4..c19cc83a93b9 100644
--- 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 9432367e3567..fa928d120634 100644
--- 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 7d882cac9c99..35d8fdaf11ff 100644
--- 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 69c06b7b049b..b3af2a2cac30 100644
--- 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 38343f316eb7..2ab9b28f9497 100644
--- 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 609f0db6211d..bd98522d1e0a 100644
--- 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 3e7745aec2af..135db06b8ea3 100644
--- 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 3b3b69dfad39..1847f80d46b1 100644
--- 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: