FIxed dumpling - emperor upgrade suites

Reformatted many of the yaml files.
Fixed duplication of workunit definitions.
Do not do install.upgrade on clients.
Included branch: definition in final workload files.

Signed-off-by: Warren Usui <warren.usui@inktank.com>

diff --git a/suites/upgrade/dumpling-emperor-x/parallel/2-workload/rados_api.yaml b/suites/upgrade/dumpling-emperor-x/parallel/2-workload/rados_api.yaml
index e7f67194d00f331fd0f5f4ed69371cba56e05602..96d656e4932226e3aedb9bb8dfb85e00ac34082a 100644 (file)
--- a/suites/upgrade/dumpling-emperor-x/parallel/2-workload/rados_api.yaml
+++ b/suites/upgrade/dumpling-emperor-x/parallel/2-workload/rados_api.yaml
@@ -1,9 +1,8 @@
 workload:
    sequential:
-     - workunit:
+   - workunit:
        branch: dumpling
        clients:
-          client.0:
-            - rados/test.sh
-            - cls
-
+         client.0:
+         - rados/test.sh
+         - cls

diff --git a/suites/upgrade/dumpling-emperor-x/parallel/2-workload/rados_loadgenbig.yaml b/suites/upgrade/dumpling-emperor-x/parallel/2-workload/rados_loadgenbig.yaml
index 8fbf5602e2d7e5a193acbfa72794f4fc0eb4e813..16241b3bed642f9a226d63028f9fb9f7f18ee135 100644 (file)
--- a/suites/upgrade/dumpling-emperor-x/parallel/2-workload/rados_loadgenbig.yaml
+++ b/suites/upgrade/dumpling-emperor-x/parallel/2-workload/rados_loadgenbig.yaml
@@ -1,7 +1,7 @@
 workload:
    sequential:
-    -  workunit:
+   - workunit:
        branch: dumpling
        clients:
-          client.0:
-             - rados/load-gen-big.sh
+         client.0:
+         - rados/load-gen-big.sh

diff --git a/suites/upgrade/dumpling-emperor-x/parallel/2-workload/test_rbd_api.yaml b/suites/upgrade/dumpling-emperor-x/parallel/2-workload/test_rbd_api.yaml
index d22b1141449185d205f4e1d296130b53f350718d..7584f0e1ff087113b68fe7e77f2b850d9cefa77c 100644 (file)
--- a/suites/upgrade/dumpling-emperor-x/parallel/2-workload/test_rbd_api.yaml
+++ b/suites/upgrade/dumpling-emperor-x/parallel/2-workload/test_rbd_api.yaml
@@ -1,7 +1,7 @@
 workload:
   sequential:
-    - workunit:
+  - workunit:
       branch: dumpling
       clients:
         client.0:
-           - rbd/test_librbd.sh
+        - rbd/test_librbd.sh

diff --git a/suites/upgrade/dumpling-emperor-x/parallel/2-workload/test_rbd_python.yaml b/suites/upgrade/dumpling-emperor-x/parallel/2-workload/test_rbd_python.yaml
index 076a1f43dda4b2af49848a277d63e1bdf0494701..09c5326592bd23d372619d3c7872857f692cbe32 100644 (file)
--- a/suites/upgrade/dumpling-emperor-x/parallel/2-workload/test_rbd_python.yaml
+++ b/suites/upgrade/dumpling-emperor-x/parallel/2-workload/test_rbd_python.yaml
@@ -1,7 +1,7 @@
 workload:
   sequential:
-    - workunit:
+  - workunit:
       branch: dumpling
       clients:
         client.0:
-           - rbd/test_librbd_python.sh
+        - rbd/test_librbd_python.sh

diff --git a/suites/upgrade/dumpling-emperor-x/parallel/3-emperor-upgrade/emperor.yaml b/suites/upgrade/dumpling-emperor-x/parallel/3-emperor-upgrade/emperor.yaml
index 388d9bb2f439d88d8b88d62828dcb173a42fa8bc..626bc161cbd3f2b1ee52da3bf4e01ed9e2c0a64a 100644 (file)
--- a/suites/upgrade/dumpling-emperor-x/parallel/3-emperor-upgrade/emperor.yaml
+++ b/suites/upgrade/dumpling-emperor-x/parallel/3-emperor-upgrade/emperor.yaml
@@ -1,9 +1,10 @@
 tasks:
-- install.upgrade:
-   branch: emperor
-- ceph:
-   fs: xfs
-- ceph.restart:
-- parallel:
-   - workload
-   - upgrade-sequence
+   - install.upgrade:
+       mon.a:
+         branch: emperor
+       mon.b:
+         branch: emperor
+   - ceph.restart:
+   - parallel:
+     - workload2
+     - upgrade-sequence

diff --git a/suites/upgrade/dumpling-emperor-x/parallel/4-workload/rados_api.yaml b/suites/upgrade/dumpling-emperor-x/parallel/4-workload/rados_api.yaml
index e7f67194d00f331fd0f5f4ed69371cba56e05602..b6bb42048a442e624fcb9268aec33519dab69c97 100644 (file)
--- a/suites/upgrade/dumpling-emperor-x/parallel/4-workload/rados_api.yaml
+++ b/suites/upgrade/dumpling-emperor-x/parallel/4-workload/rados_api.yaml
@@ -1,9 +1,8 @@
-workload:
-   sequential:
-     - workunit:
-       branch: dumpling
-       clients:
-          client.0:
-            - rados/test.sh
-            - cls
-
+workload2:
+  sequential:
+  - workunit:
+      branch: dumpling
+      clients:
+        client.0:
+        - rados/test.sh
+        - cls

diff --git a/suites/upgrade/dumpling-emperor-x/parallel/4-workload/rados_loadgenbig.yaml b/suites/upgrade/dumpling-emperor-x/parallel/4-workload/rados_loadgenbig.yaml
index 8fbf5602e2d7e5a193acbfa72794f4fc0eb4e813..fd5c31dc4775d23a14411c31fdabdaea13b4be99 100644 (file)
--- a/suites/upgrade/dumpling-emperor-x/parallel/4-workload/rados_loadgenbig.yaml
+++ b/suites/upgrade/dumpling-emperor-x/parallel/4-workload/rados_loadgenbig.yaml
@@ -1,7 +1,7 @@
-workload:
-   sequential:
-    -  workunit:
-       branch: dumpling
-       clients:
-          client.0:
-             - rados/load-gen-big.sh
+workload2:
+  sequential:
+  - workunit:
+      branch: dumpling
+      clients:
+        client.0:
+        - rados/load-gen-big.sh

diff --git a/suites/upgrade/dumpling-emperor-x/parallel/4-workload/test_rbd_api.yaml b/suites/upgrade/dumpling-emperor-x/parallel/4-workload/test_rbd_api.yaml
index d22b1141449185d205f4e1d296130b53f350718d..8c8c97a4bf301168501f236a50125b60420bc17b 100644 (file)
--- a/suites/upgrade/dumpling-emperor-x/parallel/4-workload/test_rbd_api.yaml
+++ b/suites/upgrade/dumpling-emperor-x/parallel/4-workload/test_rbd_api.yaml
@@ -1,7 +1,7 @@
-workload:
+workload2:
   sequential:
-    - workunit:
+  - workunit:
       branch: dumpling
       clients:
         client.0:
-           - rbd/test_librbd.sh
+        - rbd/test_librbd.sh

diff --git a/suites/upgrade/dumpling-emperor-x/parallel/4-workload/test_rbd_python.yaml b/suites/upgrade/dumpling-emperor-x/parallel/4-workload/test_rbd_python.yaml
index 076a1f43dda4b2af49848a277d63e1bdf0494701..1edb13cf907b7b4ce3d847cf53f52d85cc6bf832 100644 (file)
--- a/suites/upgrade/dumpling-emperor-x/parallel/4-workload/test_rbd_python.yaml
+++ b/suites/upgrade/dumpling-emperor-x/parallel/4-workload/test_rbd_python.yaml
@@ -1,7 +1,7 @@
-workload:
+workload2:
   sequential:
-    - workunit:
+  - workunit:
       branch: dumpling
       clients:
         client.0:
-           - rbd/test_librbd_python.sh
+        - rbd/test_librbd_python.sh

diff --git a/suites/upgrade/dumpling-emperor-x/parallel/5-upgrade-sequence/upgrade-all.yaml b/suites/upgrade/dumpling-emperor-x/parallel/5-upgrade-sequence/upgrade-all.yaml
index 9aebbf50e369285107218abb495c87bc44ae72c2..da6028e47b25f5f24e5ed7173d268214d72060ad 100644 (file)
--- a/suites/upgrade/dumpling-emperor-x/parallel/5-upgrade-sequence/upgrade-all.yaml
+++ b/suites/upgrade/dumpling-emperor-x/parallel/5-upgrade-sequence/upgrade-all.yaml
@@ -1,4 +1,8 @@
 upgrade-sequence:
    sequential:
    - install.upgrade:
+       mon.a:
+         branch: emperor
+       mon.b:
+         branch: emperor
    - ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3]

diff --git a/suites/upgrade/dumpling-emperor-x/parallel/5-upgrade-sequence/upgrade-mds-mon-osd.yaml b/suites/upgrade/dumpling-emperor-x/parallel/5-upgrade-sequence/upgrade-mds-mon-osd.yaml
index df65c74e385d592fcba29c3d51121e485cbc109f..042e0352f1c7c07cbcb83d31ca84b0c44c4c6ad0 100644 (file)
--- a/suites/upgrade/dumpling-emperor-x/parallel/5-upgrade-sequence/upgrade-mds-mon-osd.yaml
+++ b/suites/upgrade/dumpling-emperor-x/parallel/5-upgrade-sequence/upgrade-mds-mon-osd.yaml
@@ -1,7 +1,10 @@
 upgrade-sequence:
    sequential:
    - install.upgrade:
-      all:
+      mon.a:
+        branch: emperor
+      mon.b:
+        branch: emperor
    - ceph.restart: [mds.a]
    - sleep:
        duration: 60

diff --git a/suites/upgrade/dumpling-emperor-x/parallel/5-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/dumpling-emperor-x/parallel/5-upgrade-sequence/upgrade-mon-osd-mds.yaml
index 25eb6e48413fc75f34b1db06ae25efd93e4476be..e58dcec06bc5cf491569b103145a89f19591188f 100644 (file)
--- a/suites/upgrade/dumpling-emperor-x/parallel/5-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ b/suites/upgrade/dumpling-emperor-x/parallel/5-upgrade-sequence/upgrade-mon-osd-mds.yaml
@@ -1,7 +1,10 @@
 upgrade-sequence:
    sequential:
    - install.upgrade:
-      all:
+      mon.a:
+        branch: emperor
+      mon.b:
+        branch: emperor
    - ceph.restart:
        daemons: [mon.a]
        wait-for-healthy: false

diff --git a/suites/upgrade/dumpling-emperor-x/parallel/5-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade/dumpling-emperor-x/parallel/5-upgrade-sequence/upgrade-osd-mon-mds.yaml
index e497800d547a211cb39d68916486a356b726841e..79873f6e7cf133265039b97d44207c6bdef1671b 100644 (file)
--- a/suites/upgrade/dumpling-emperor-x/parallel/5-upgrade-sequence/upgrade-osd-mon-mds.yaml
+++ b/suites/upgrade/dumpling-emperor-x/parallel/5-upgrade-sequence/upgrade-osd-mon-mds.yaml
@@ -1,7 +1,10 @@
 upgrade-sequence:
    sequential:
    - install.upgrade:
-      all:
+      mon.a:
+        branch: emperor
+      mon.b:
+        branch: emperor
    - ceph.restart: [osd.0]
    - sleep:
        duration: 60

diff --git a/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/rados_loadgenmix.yaml b/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/rados_loadgenmix.yaml
index a0a4ada5671c9ba12969bcda9a7369b22f2d6218..0bddda0ab841d9499c3734e58fb74d33b94ff74b 100644 (file)
--- a/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/rados_loadgenmix.yaml
+++ b/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/rados_loadgenmix.yaml
@@ -1,5 +1,6 @@
 tasks:
-- workunit:
-   clients:
-     client.1:
-       - rados/load-gen-mix.sh
+  - workunit:
+      branch: dumpling
+      clients:
+        client.1:
+        - rados/load-gen-mix.sh

diff --git a/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/rados_mon_thrash.yaml b/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/rados_mon_thrash.yaml
index c4a38761ab7e22dc6f0f007e6689a5135052f6b4..1a932e059f07bc6c602abd9c654ae09151274f88 100644 (file)
--- a/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/rados_mon_thrash.yaml
+++ b/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/rados_mon_thrash.yaml
@@ -3,6 +3,7 @@ tasks:
     revive_delay: 20
     thrash_delay: 1
 - workunit:
+    branch: dumpling
     clients:
       client.1:
-        - rados/test.sh
+      - rados/test.sh

diff --git a/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/rbd_cls.yaml b/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/rbd_cls.yaml
index f19ef8f06693c8f2120c340950d880525563daa3..9407ab48916b9131afaebd742861a55c14995e75 100644 (file)
--- a/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/rbd_cls.yaml
+++ b/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/rbd_cls.yaml
@@ -1,6 +1,7 @@
 tasks:
 - workunit:
+    branch: dumpling
     clients:
       client.1:
-        - cls/test_cls_rbd.sh
+      - cls/test_cls_rbd.sh
 

diff --git a/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/rbd_import_export.yaml b/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/rbd_import_export.yaml
index 6bb704f2817410a14b8ab36e9ab60fb3dbee4665..185cd1ab32aae1288221360ebb96b3880d60124b 100644 (file)
--- a/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/rbd_import_export.yaml
+++ b/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/rbd_import_export.yaml
@@ -1,7 +1,8 @@
 tasks:
 - workunit:
+     branch: dumpling
      clients:
         client.1:
-           - rbd/import_export.sh
+        - rbd/import_export.sh
      env:
         RBD_CREATE_ARGS: --new-format