From 48be6e45de4746e656bf65f8d09ac867c6b31990 Mon Sep 17 00:00:00 2001
From: Yuri Weinstein <yuri.weinstein@inktank.com>
Date: Fri, 10 Oct 2014 15:35:13 -0700
Subject: [PATCH] Incorporated Tamil's comments

Signed-off-by: Yuri Weinstein <yuri.weinstein@inktank.com>
---
 suites/upgrade/giant/0-cluster/start.yaml    |  2 ++
 suites/upgrade/giant/1-install/v0.86.RC.yaml | 12 ----------
 suites/upgrade/giant/4-final/monthrash.yaml  | 23 ++++++++++----------
 3 files changed, 13 insertions(+), 24 deletions(-)
 delete mode 100644 suites/upgrade/giant/1-install/v0.86.RC.yaml

diff --git a/suites/upgrade/giant/0-cluster/start.yaml b/suites/upgrade/giant/0-cluster/start.yaml
index 1a8e8ed3ba8e8..5f2f97159294d 100644
--- 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
index 8f19d80d477cf..0000000000000
--- 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 3bd34df15009f..7833c1c773480 100644
--- 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"
 
-- 
2.39.5