Added one more workload and one more step upgarde to teh current firefly branch,...

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

diff --git a/suites/upgrade/firefly/singleton/all/versions-steps.yaml b/suites/upgrade/firefly/singleton/all/versions-steps.yaml
index 68f7fcfa34ce108bc23b17c23201f7385eb99365..d35deb5bfc7f9f3ba61ce5d4233a050c62a49d86 100644 (file)
--- 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:
+   - workload_firefly
+   - upgrade-sequence_firefly
+- print: "**** done parallel firefly branch"
 ######################
 workload:
    workunit:
@@ -142,3 +146,49 @@ upgrade-sequence2:
    - sleep:
        duration: 60
    - print: "**** done ceph.restart all 2"
+workload_firefly:
+  sequential:
+  - rgw: [client.0]
+  - s3tests:
+      client.0:
+        force-branch: firefly-original
+        rgw_server: client.0
+upgrade-sequence_firefly:
+   sequential:
+   - install.upgrade:
+       mon.a:
+         branch: firefly
+       mon.b:
+         branch: firefly
+   - print: "**** done branch: firefly install.upgrade"
+   - 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: 60
+   - 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
+   - print: "**** done ceph.restart all firefly current branch"