Fixed double 'tasks' incorrect lines, added rados and rgw workloads

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

diff --git a/suites/upgrade/firefly/singleton/all-x/upgrade_client_first.yaml b/suites/upgrade/firefly/singleton/all-x/upgrade_client_first.yaml
index 1cd1c906bdbdc1620701164177cab99afa97275e..c94de8e46f36b07c1f1df288244e0adb48480e42 100644 (file)
--- a/suites/upgrade/firefly/singleton/all-x/upgrade_client_first.yaml
+++ b/suites/upgrade/firefly/singleton/all-x/upgrade_client_first.yaml
@@ -17,33 +17,47 @@ roles:
   - osd.2
   - osd.3
 - - client.0
-  - client.1
 tasks:
 - install:
    branch: dumpling
 - print: "**** done install dumpling" 
 - ceph:
    fs: xfs
-###########
-tasks:
-   - install.upgrade:
-       client.0:
-   # client.1 will be upgraded as well as it's on the same host as client.0
-   - print: "**** done install.upgrade on clinet.0 and client.1" 
-   - install.upgrade:
-       mon.a:
-       mon.b:
-   - print: "**** done install.upgrade" 
-   - ceph.restart: 
-       daemons: [osd.0, osd.1, osd.2]
-   - print: "**** done restart" 
-   - sequential:
-      - workload
-   - print: "**** done workload" 
-workload:
-  sequential:
-  - workunit:
+- print: "**** done ceph"
+- install.upgrade:
+    client.0:
+- print: "**** done install.upgrade on clinet.0" 
+- install.upgrade:
+    mon.a:
+    mon.b:
+- print: "**** done install.upgrade" 
+- ceph.restart: 
+    daemons: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1]
+- print: "**** done restart all" 
+- workunit:
+    branch: firefly
       clients:
         client.0:
         - rbd/test_librbd_python.sh
-  - print: "**** done rbd/test_librbd_python.sh" 
+- print: "**** done rbd/test_librbd_python.sh"
+- workunit:
+    branch: firefly
+      clients:
+        client.0:
+        - rados/test.sh
+        - cls
+- print: "**** done rados/test.sh &  cls" 
+- workunit:
+    branch: firefly
+      clients:
+        client.0:
+          - rbd/import_export.sh
+      env:
+        RBD_CREATE_ARGS: --new-format
+- print: "**** done rbd/import_export.sh"
+- workunit:
+    branch: firefly
+      clients:
+        client.0:
+          - cls/test_cls_rbd.sh
+- print: "**** done cls/test_cls_rbd.sh"