Added new v0.80.8 to

/newer
singleton/version
singleton/version-x
Added more logging

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

diff --git a/suites/upgrade/firefly/newer/1-install/v0.80.8.yaml b/suites/upgrade/firefly/newer/1-install/v0.80.8.yaml
new file mode 100644 (file)
index 0000000..b697c56
--- /dev/null
+++ b/suites/upgrade/firefly/newer/1-install/v0.80.8.yaml
@@ -0,0 +1,7 @@
+tasks:
+- install:
+    tag: v0.80.7
+- 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 afcbc30b3a4b983f2d14fb08749276c94f323873..18af409dce1d92e345a2b6c98ac5fbc442a44c76 100644 (file)
--- a/suites/upgrade/firefly/singleton/versions-steps-x/versions-steps-x.yaml
+++ b/suites/upgrade/firefly/singleton/versions-steps-x/versions-steps-x.yaml
@@ -41,6 +41,10 @@ tasks:
 - parallel:
    - workload3
    - upgrade-sequence3
+- print: "**** done parallel v0.80.8"
+- parallel:
+   - workload_firefly
+   - upgrade-sequence_firefly
 - print: "**** done parallel firefly"
 - parallel:
    - workload-x
@@ -124,6 +128,7 @@ workload2:
        clients:
          client.0:
            - cls/test_cls_rbd.sh
+   - print: "**** done cls/test_cls_rbd.sh workload2"
 upgrade-sequence2:
    sequential:
    - install.upgrade:
@@ -166,6 +171,54 @@ upgrade-sequence2:
        duration: 60
    - print: "**** done ceph.restart all 2 osd/mon/mds"
 workload3:
+   sequential:
+   - workunit:
+       clients:
+         client.0:
+           - cls/test_cls_rbd.sh
+   - print: "**** done cls/test_cls_rbd.sh workload3"
+upgrade-sequence3:
+   sequential:
+   - install.upgrade:
+       mon.a:
+         tag: v0.80.8
+       mon.b:
+         tag: v0.80.8
+       client.1:
+         tag: v0.80.8
+   - print: "**** done v0.80.8 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 3 osd/mon/mds"
+workload_firefly:
   rados:
     clients: [client.0]
     ops: 2000
@@ -177,7 +230,7 @@ workload3:
       snap_create: 50
       snap_remove: 50
       rollback: 50
-upgrade-sequence3:
+upgrade-sequence_firefly:
    sequential:
    - install.upgrade:
        mon.a:

diff --git a/suites/upgrade/firefly/singleton/versions-steps/versions-steps.yaml b/suites/upgrade/firefly/singleton/versions-steps/versions-steps.yaml
index 8540ed8128f714e4edb45649a4aac8a07535eb9c..35c6c103f0a1c822cae651902dae91afe234322a 100644 (file)
--- a/suites/upgrade/firefly/singleton/versions-steps/versions-steps.yaml
+++ b/suites/upgrade/firefly/singleton/versions-steps/versions-steps.yaml
@@ -38,34 +38,40 @@ tasks:
    - workload2
    - upgrade-sequence2
 - print: "**** done parallel v0.80.7"
+- parallel:
+   - workload3
+   - upgrade-sequence3
+- print: "**** done parallel v0.80.8"
 - parallel:
    - workload_firefly
    - upgrade-sequence_firefly
 - print: "**** done parallel firefly branch"
 #######################
 workload:
-   workunit:
-      clients:
+   sequential:
+   - workunit:
+       clients:
          client.0:
            - suites/blogbench.sh
+   - print: "**** done suites/blogbench.sh workload"
 workload1:
    sequential:
    - workunit:
        clients:
          client.0:
          - rados/load-gen-big.sh
-   - print: "**** done rados/load-gen-big.sh"
+   - print: "**** done rados/load-gen-big.sh workload1"
    - workunit:
        clients:
          client.0:
          - rados/test.sh
          - cls
-   - print: "**** done rados/test.sh &  cls"
+   - print: "**** done rados/test.sh &  cls workload1"
    - workunit:
        clients:
          client.0:
          - rbd/test_librbd.sh
-   - print: "**** done rbd/test_librbd.sh"
+   - print: "**** done rbd/test_librbd.sh workload1"
 upgrade-sequence1:
    sequential:
    - install.upgrade:
@@ -120,6 +126,7 @@ workload2:
        clients:
          client.0:
            - cls/test_cls_rbd.sh
+   - print: "**** done cls/test_cls_rbd.sh workload2"
 upgrade-sequence2:
    sequential:
    - install.upgrade:
@@ -161,13 +168,74 @@ upgrade-sequence2:
    - sleep:
        duration: 60
    - print: "**** done ceph.restart all 2 osd/mon/mds"
+workload3:
+   sequential:
+   - workunit:
+       clients:
+         client.0:
+         - rados/load-gen-big.sh
+   - print: "**** done rados/load-gen-big.sh workload3"
+   - workunit:
+       clients:
+         client.0:
+         - rados/test.sh
+         - cls
+   - print: "**** done rados/test.sh &  cls workload3"
+   - workunit:
+       clients:
+         client.0:
+         - rbd/test_librbd.sh
+   - print: "**** done rbd/test_librbd.sh workload3"
+upgrade-sequence3:
+   sequential:
+   - install.upgrade:
+       mon.a:
+         tag: v0.80.8
+       mon.b:
+         tag: v0.80.8
+       client.1:
+         tag: v0.80.8
+   - print: "**** done v0.80.8 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  mon/mds/osd upgrade-sequence3"
 workload_firefly:
-  sequential:
-  - rgw: [client.0]
-  - s3tests:
-      client.0:
-        force-branch: firefly-original
-        rgw_server: client.0
+   sequential:
+   - rgw: [client.0]
+   - print: "**** done rgw workload_firefly"
+   - s3tests:
+       client.0:
+         force-branch: firefly-original
+         rgw_server: client.0
+  - print: "**** done s3tests workload_firefly"
 upgrade-sequence_firefly:
    sequential:
    - install.upgrade: