From 81afbd617a5522af6a30944f7e4eb2c8fbf84476 Mon Sep 17 00:00:00 2001
From: Yuri Weinstein <yuri.weinstein@inktank.com>
Date: Tue, 10 Mar 2015 14:23:16 -0700
Subject: [PATCH] Added v0.80.9 to upgrade/firefly suite, fixed #11072

Signed-off-by: Yuri Weinstein <yuri.weinstein@inktank.com>
---
 .../firefly/newer/1-install/v0.80.9.yaml      |  7 +++
 .../versions-steps-x/versions-steps-x.yaml    | 63 +++++++++++++++++++
 .../versions-steps/versions-steps.yaml        | 63 +++++++++++++++++++
 3 files changed, 133 insertions(+)
 create mode 100644 suites/upgrade/firefly/newer/1-install/v0.80.9.yaml

diff --git a/suites/upgrade/firefly/newer/1-install/v0.80.9.yaml b/suites/upgrade/firefly/newer/1-install/v0.80.9.yaml
new file mode 100644
index 0000000000000..374b7e0f43678
--- /dev/null
+++ b/suites/upgrade/firefly/newer/1-install/v0.80.9.yaml
@@ -0,0 +1,7 @@
+tasks:
+- install:
+    tag: v0.80.9
+- ceph:
+- parallel:
+   - workload
+   - upgrade-sequence
diff --git a/suites/upgrade/firefly/singleton/versions-steps-x/versions-steps-x.yaml b/suites/upgrade/firefly/singleton/versions-steps-x/versions-steps-x.yaml
index 18af409dce1d9..a3ea6a601297a 100644
--- a/suites/upgrade/firefly/singleton/versions-steps-x/versions-steps-x.yaml
+++ b/suites/upgrade/firefly/singleton/versions-steps-x/versions-steps-x.yaml
@@ -42,6 +42,10 @@ tasks:
    - workload3
    - upgrade-sequence3
 - print: "**** done parallel v0.80.8"
+- parallel:
+   - workload4
+   - upgrade-sequence4
+- print: "**** done parallel v0.80.9"
 - parallel:
    - workload_firefly
    - upgrade-sequence_firefly
@@ -218,6 +222,65 @@ upgrade-sequence3:
    - sleep:
        duration: 60
    - print: "**** done ceph.restart all 3 osd/mon/mds"
+workload4:
+   sequential:
+   - workunit:
+       clients:
+         client.0:
+         - rados/load-gen-big.sh
+   - print: "**** done rados/load-gen-big.sh workload4"
+   - workunit:
+       clients:
+         client.0:
+         - rados/test.sh
+         - cls
+   - print: "**** done rados/test.sh &  cls workload4"
+   - workunit:
+       clients:
+         client.0:
+         - rbd/test_librbd.sh
+   - print: "**** done rbd/test_librbd.sh workload4"
+upgrade-sequence4:
+   sequential:
+   - install.upgrade:
+       mon.a:
+         tag: v0.80.9
+       mon.b:
+         tag: v0.80.9
+       client.1:
+         tag: v0.80.9
+   - print: "**** done v0.80.9 install.upgrade"
+   - ceph.restart: [mon.a]
+   - sleep:
+       duration: 60
+   - ceph.restart: [mon.b]
+   - sleep:
+       duration: 60
+   - ceph.restart: [mon.c]
+   - sleep:
+       duration: 60
+   - ceph.restart: [mds.a]
+   - sleep:
+       duration: 60
+   - ceph.restart: [osd.0]
+   - sleep:
+       duration: 30
+   - ceph.restart: [osd.1]
+   - sleep:
+       duration: 30
+   - ceph.restart: [osd.2]
+   - sleep:
+       duration: 30
+   - ceph.restart: [osd.3]
+   - sleep:
+       duration: 30
+   - ceph.restart: [osd.4]
+   - sleep:
+       duration: 30
+   - ceph.restart: [osd.5]
+   - sleep:
+       duration: 30
+   - print: "**** done ceph.restart all 1 mon/mds/osd upgrade-sequence4"
 workload_firefly:
   rados:
     clients: [client.0]
diff --git a/suites/upgrade/firefly/singleton/versions-steps/versions-steps.yaml b/suites/upgrade/firefly/singleton/versions-steps/versions-steps.yaml
index f483e4810b733..3f0f30a608b4e 100644
--- a/suites/upgrade/firefly/singleton/versions-steps/versions-steps.yaml
+++ b/suites/upgrade/firefly/singleton/versions-steps/versions-steps.yaml
@@ -42,6 +42,10 @@ tasks:
    - workload3
    - upgrade-sequence3
 - print: "**** done parallel v0.80.8"
+- parallel:
+   - workload4
+   - upgrade-sequence4
+- print: "**** done parallel v0.80.9"
 - parallel:
    - workload_firefly
    - upgrade-sequence_firefly
@@ -227,6 +231,65 @@ upgrade-sequence3:
    - sleep:
        duration: 30
    - print: "**** done ceph.restart all  mon/mds/osd upgrade-sequence3"
+workload4:
+   sequential:
+   - workunit:
+       clients:
+         client.0:
+         - rados/load-gen-big.sh
+   - print: "**** done rados/load-gen-big.sh workload4"
+   - workunit:
+       clients:
+         client.0:
+         - rados/test.sh
+         - cls
+   - print: "**** done rados/test.sh &  cls workload4"
+   - workunit:
+       clients:
+         client.0:
+         - rbd/test_librbd.sh
+   - print: "**** done rbd/test_librbd.sh workload4"
+upgrade-sequence4:
+   sequential:
+   - install.upgrade:
+       mon.a:
+         tag: v0.80.9
+       mon.b:
+         tag: v0.80.9
+       client.1:
+         tag: v0.80.9
+   - print: "**** done v0.80.9 install.upgrade"
+   - ceph.restart: [mon.a]
+   - sleep:
+       duration: 60
+   - ceph.restart: [mon.b]
+   - sleep:
+       duration: 60
+   - ceph.restart: [mon.c]
+   - sleep:
+       duration: 60
+   - ceph.restart: [mds.a]
+   - sleep:
+       duration: 60
+   - ceph.restart: [osd.0]
+   - sleep:
+       duration: 30
+   - ceph.restart: [osd.1]
+   - sleep:
+       duration: 30
+   - ceph.restart: [osd.2]
+   - sleep:
+       duration: 30
+   - ceph.restart: [osd.3]
+   - sleep:
+       duration: 30
+   - ceph.restart: [osd.4]
+   - sleep:
+       duration: 30
+   - ceph.restart: [osd.5]
+   - sleep:
+       duration: 30
+   - print: "**** done ceph.restart all 1 mon/mds/osd upgrade-sequence4"
 workload_firefly:
    sequential:
    - rgw: [client.0]
-- 
2.39.5