Incorporated Tamil's comments

Signed-off-by: Yuri Weinstein <yuri.weinstein@inktank.com>

diff --git a/suites/upgrade/giant/0-cluster/start.yaml b/suites/upgrade/giant/0-cluster/start.yaml
index 1a8e8ed3ba8e82886a56618884f69d4e8f37dfcd..5f2f97159294d50b28614f08c35441260d31b19b 100644 (file)
--- a/suites/upgrade/giant/0-cluster/start.yaml
+++ b/suites/upgrade/giant/0-cluster/start.yaml
@@ -2,6 +2,8 @@ overrides:
   ceph:
     log-whitelist:
     - scrub
+    - scrub mismatch
+    - ScrubResult
     fs: xfs
 roles:
 - - mon.a

diff --git a/suites/upgrade/giant/1-install/v0.86.RC.yaml b/suites/upgrade/giant/1-install/v0.86.RC.yaml
deleted file mode 100644 (file)
index 8f19d80..0000000
--- a/suites/upgrade/giant/1-install/v0.86.RC.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-tasks:
-- install:
-    tag: v0.86
-- print: "**** done giant RC install"
-- ceph:
-    log-whitelist:
-      - scrub mismatch
-      - ScrubResult
-- parallel:
-   - workload
-   - upgrade-sequence
-- print: "**** done parallel"

diff --git a/suites/upgrade/giant/4-final/monthrash.yaml b/suites/upgrade/giant/4-final/monthrash.yaml
index 3bd34df15009f0ae0acc5aceb9b2842c698876a0..7833c1c77348099a4e372942dc56e372522116db 100644 (file)
--- a/suites/upgrade/giant/4-final/monthrash.yaml
+++ b/suites/upgrade/giant/4-final/monthrash.yaml
@@ -1,14 +1,13 @@
 tasks:
-- sequential:
-  - mon_thrash:
-      revive_delay: 20
-      thrash_delay: 1
-  - print: "**** done mon_thrash"
-  - ceph-fuse:
-  - print: "**** done ceph-fuse"
-  - workunit:
-      clients:
-        client.0:
-          - suites/dbench.sh
-  - print: "**** done suites/dbench.sh"
+- mon_thrash:
+    revive_delay: 20
+    thrash_delay: 1
+- print: "**** done mon_thrash"
+- ceph-fuse:
+- print: "**** done ceph-fuse"
+- workunit:
+    clients:
+      client.0:
+        - suites/dbench.sh
+- print: "**** done suites/dbench.sh"