From 7b83aa615940cdb8ad68177fe112c48fadfc4b09 Mon Sep 17 00:00:00 2001
From: Yuri Weinstein <yuri.weinstein@inktank.com>
Date: Thu, 16 Oct 2014 15:40:06 -0700
Subject: [PATCH] Incorporated all Tamil's comments, nut #4 (branch
 "firefly-original" for s3tests)

Signed-off-by: Yuri Weinstein <yuri.weinstein@inktank.com>
---
 .../firefly/singleton/all/versions-steps.yaml | 65 ++++++++++++++++++-
 1 file changed, 62 insertions(+), 3 deletions(-)

diff --git a/suites/upgrade/firefly/singleton/all/versions-steps.yaml b/suites/upgrade/firefly/singleton/all/versions-steps.yaml
index bd0480c99fca6..da61a80a79ada 100644
--- a/suites/upgrade/firefly/singleton/all/versions-steps.yaml
+++ b/suites/upgrade/firefly/singleton/all/versions-steps.yaml
@@ -34,6 +34,10 @@ tasks:
    - workload2
    - upgrade-sequence2
 - print: "**** done parallel 2"
+- parallel:
+   - workload3
+   - upgrade-sequence3
+- print: "**** done parallel 3"
 - parallel:
    - workload_firefly
    - upgrade-sequence_firefly
@@ -96,7 +100,7 @@ upgrade-sequence1:
    - ceph.restart: [osd.5]
    - sleep:
        duration: 30
-   - print: "**** done ceph.restart all 1"
+   - print: "**** done ceph.restart all 1 mon/mds/osd"
 workload2:
    sequential:
    - workunit:
@@ -149,7 +153,7 @@ upgrade-sequence2:
    - ceph.restart: [mds.a]
    - sleep:
        duration: 60
-   - print: "**** done ceph.restart all 2"
+   - print: "**** done ceph.restart all 2 osd/mon/mds"
 workload_firefly:
   sequential:
   - rgw: [client.0]
@@ -167,6 +171,9 @@ upgrade-sequence_firefly:
        client.1:
          branch: firefly
    - print: "**** done branch: firefly install.upgrade"
+   - ceph.restart: [mds.a]
+   - sleep:
+       duration: 60
    - ceph.restart: [osd.0]
    - sleep:
        duration: 30
@@ -194,7 +201,59 @@ upgrade-sequence_firefly:
    - ceph.restart: [mon.c]
    - sleep:
        duration: 60
+   - print: "**** done ceph.restart all firefly current branch mds/osd/mon"
+workload3:
+   workload:
+     rados:
+       clients: [client.0]
+       ops: 2000
+       objects: 50
+       op_weights:
+         read: 100
+         write: 100
+         delete: 50
+         snap_create: 50
+         snap_remove: 50
+         rollback: 50
+upgrade-sequence3:
+   sequential:
+   - install.upgrade:
+       mon.a:
+         tag: v0.80.7
+       mon.b:
+         tag: v0.80.7
+       client.1:
+         tag: v0.80.7
+   - print: "**** done v0.80.7 install.upgrade"
+   - ceph.restart: [osd.0]
+   - sleep:
+       duration: 30
+   - ceph.restart: [osd.1]
+   - sleep:
+       duration: 30
    - ceph.restart: [mds.a]
    - sleep:
        duration: 60
-   - print: "**** done ceph.restart all firefly current branch"
+   - ceph.restart: [osd.2]
+   - sleep:
+       duration: 30
+   - ceph.restart: [mon.a]
+   - sleep:
+       duration: 60
+   - ceph.restart: [osd.3]
+   - sleep:
+       duration: 30
+   - ceph.restart: [mon.b]
+   - sleep:
+       duration: 60
+   - ceph.restart: [osd.4]
+   - sleep:
+       duration: 30
+   - ceph.restart: [osd.5]
+   - sleep:
+       duration: 60
+   - ceph.restart: [mon.c]
+   - sleep:
+       duration: 60
+   - print: "**** done ceph.restart all mix"
+
-- 
2.39.5