expanding upgrade suites to include emperor.

Signed-off-by: tamil <tamil.muthamizhan@inktank.com>

diff --git a/suites/upgrade-dumpling/fs/1-dumpling-install/v0.67.3.yaml b/suites/upgrade-dumpling/fs/1-dumpling-install/v0.67.3.yaml
new file mode 100644 (file)
index 0000000..d0c1861
--- /dev/null
+++ b/suites/upgrade-dumpling/fs/1-dumpling-install/v0.67.3.yaml
@@ -0,0 +1,7 @@
+tasks:
+- install:
+    tag: v0.67.3
+- ceph:
+- parallel:
+   - workload
+   - upgrade-sequence

diff --git a/suites/upgrade-dumpling/fs/1-dumpling-install/v0.67.4.yaml b/suites/upgrade-dumpling/fs/1-dumpling-install/v0.67.4.yaml
new file mode 100644 (file)
index 0000000..4e7d7c5
--- /dev/null
+++ b/suites/upgrade-dumpling/fs/1-dumpling-install/v0.67.4.yaml
@@ -0,0 +1,7 @@
+tasks:
+- install:
+    tag: v0.67.4
+- ceph:
+- parallel:
+   - workload
+   - upgrade-sequence

diff --git a/suites/upgrade-dumpling/fs/3-upgrade-sequence/upgrade-mds-mon-osd.yaml b/suites/upgrade-dumpling/fs/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
index 38bba91895d86759c6b031e728371415f86d8987..520dc4b30cf1f04055f436db1a400e00cc2c1b44 100644 (file)
--- a/suites/upgrade-dumpling/fs/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
+++ b/suites/upgrade-dumpling/fs/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
@@ -2,7 +2,7 @@ upgrade-sequence:
    sequential:
    - install.upgrade:
       all:
-         branch: dumpling
+         branch: emperor
    - ceph.restart: [mds.a]
    - sleep:
        duration: 60

diff --git a/suites/upgrade-dumpling/fs/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade-dumpling/fs/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
index 5b617fdfd5ac3be930121a0bcd1b4748a40d5547..e11f8c3b13fd37ca18b23380c46f840736137da0 100644 (file)
--- a/suites/upgrade-dumpling/fs/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ b/suites/upgrade-dumpling/fs/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
@@ -2,7 +2,7 @@ upgrade-sequence:
    sequential:
    - install.upgrade:
       all:
-         branch: dumpling
+         branch: emperor
    - ceph.restart: [mon.a]
    - sleep:
        duration: 60

diff --git a/suites/upgrade-dumpling/fs/3-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade-dumpling/fs/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
index 91c146a20706b008480320570c23a5e3b74cf25b..78cb33be1eca77d8e70b33e28a0187eaafc00bc6 100644 (file)
--- a/suites/upgrade-dumpling/fs/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
+++ b/suites/upgrade-dumpling/fs/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
@@ -2,7 +2,7 @@ upgrade-sequence:
    sequential:
    - install.upgrade:
       all:
-         branch: dumpling
+         branch: emperor
    - ceph.restart: [osd.0]
    - sleep:
        duration: 30

diff --git a/suites/upgrade-dumpling/rados/1-dumpling-install/v0.67.3.yaml b/suites/upgrade-dumpling/rados/1-dumpling-install/v0.67.3.yaml
new file mode 100644 (file)
index 0000000..d0c1861
--- /dev/null
+++ b/suites/upgrade-dumpling/rados/1-dumpling-install/v0.67.3.yaml
@@ -0,0 +1,7 @@
+tasks:
+- install:
+    tag: v0.67.3
+- ceph:
+- parallel:
+   - workload
+   - upgrade-sequence

diff --git a/suites/upgrade-dumpling/rados/1-dumpling-install/v0.67.4.yaml b/suites/upgrade-dumpling/rados/1-dumpling-install/v0.67.4.yaml
new file mode 100644 (file)
index 0000000..4e7d7c5
--- /dev/null
+++ b/suites/upgrade-dumpling/rados/1-dumpling-install/v0.67.4.yaml
@@ -0,0 +1,7 @@
+tasks:
+- install:
+    tag: v0.67.4
+- ceph:
+- parallel:
+   - workload
+   - upgrade-sequence

diff --git a/suites/upgrade-dumpling/rados/3-upgrade-sequence/upgrade-mds-mon-osd.yaml b/suites/upgrade-dumpling/rados/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
index 38bba91895d86759c6b031e728371415f86d8987..520dc4b30cf1f04055f436db1a400e00cc2c1b44 100644 (file)
--- a/suites/upgrade-dumpling/rados/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
+++ b/suites/upgrade-dumpling/rados/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
@@ -2,7 +2,7 @@ upgrade-sequence:
    sequential:
    - install.upgrade:
       all:
-         branch: dumpling
+         branch: emperor
    - ceph.restart: [mds.a]
    - sleep:
        duration: 60

diff --git a/suites/upgrade-dumpling/rados/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade-dumpling/rados/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
index 5b617fdfd5ac3be930121a0bcd1b4748a40d5547..e11f8c3b13fd37ca18b23380c46f840736137da0 100644 (file)
--- a/suites/upgrade-dumpling/rados/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ b/suites/upgrade-dumpling/rados/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
@@ -2,7 +2,7 @@ upgrade-sequence:
    sequential:
    - install.upgrade:
       all:
-         branch: dumpling
+         branch: emperor
    - ceph.restart: [mon.a]
    - sleep:
        duration: 60

diff --git a/suites/upgrade-dumpling/rados/3-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade-dumpling/rados/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
index 801bab9f1f0de62b44ee1c16211e181f8407c9f9..f0fa4b886c590c57e6193bd4f16f74d443aa1bd9 100644 (file)
--- a/suites/upgrade-dumpling/rados/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
+++ b/suites/upgrade-dumpling/rados/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
@@ -2,7 +2,7 @@ upgrade-sequence:
    sequential:
    - install.upgrade:
       all:
-         branch: dumpling
+         branch: emperor
    - ceph.restart: [osd.0]
    - sleep:
        duration: 30

diff --git a/suites/upgrade-dumpling/rbd/1-dumpling-install/v0.67.3.yaml b/suites/upgrade-dumpling/rbd/1-dumpling-install/v0.67.3.yaml
new file mode 100644 (file)
index 0000000..d0c1861
--- /dev/null
+++ b/suites/upgrade-dumpling/rbd/1-dumpling-install/v0.67.3.yaml
@@ -0,0 +1,7 @@
+tasks:
+- install:
+    tag: v0.67.3
+- ceph:
+- parallel:
+   - workload
+   - upgrade-sequence

diff --git a/suites/upgrade-dumpling/rbd/1-dumpling-install/v0.67.4.yaml b/suites/upgrade-dumpling/rbd/1-dumpling-install/v0.67.4.yaml
new file mode 100644 (file)
index 0000000..4e7d7c5
--- /dev/null
+++ b/suites/upgrade-dumpling/rbd/1-dumpling-install/v0.67.4.yaml
@@ -0,0 +1,7 @@
+tasks:
+- install:
+    tag: v0.67.4
+- ceph:
+- parallel:
+   - workload
+   - upgrade-sequence

diff --git a/suites/upgrade-dumpling/rbd/3-upgrade-sequence/upgrade-mds-mon-osd.yaml b/suites/upgrade-dumpling/rbd/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
index 38bba91895d86759c6b031e728371415f86d8987..520dc4b30cf1f04055f436db1a400e00cc2c1b44 100644 (file)
--- a/suites/upgrade-dumpling/rbd/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
+++ b/suites/upgrade-dumpling/rbd/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
@@ -2,7 +2,7 @@ upgrade-sequence:
    sequential:
    - install.upgrade:
       all:
-         branch: dumpling
+         branch: emperor
    - ceph.restart: [mds.a]
    - sleep:
        duration: 60

diff --git a/suites/upgrade-dumpling/rbd/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade-dumpling/rbd/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
index 5b617fdfd5ac3be930121a0bcd1b4748a40d5547..e11f8c3b13fd37ca18b23380c46f840736137da0 100644 (file)
--- a/suites/upgrade-dumpling/rbd/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ b/suites/upgrade-dumpling/rbd/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
@@ -2,7 +2,7 @@ upgrade-sequence:
    sequential:
    - install.upgrade:
       all:
-         branch: dumpling
+         branch: emperor
    - ceph.restart: [mon.a]
    - sleep:
        duration: 60

diff --git a/suites/upgrade-dumpling/rbd/3-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade-dumpling/rbd/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
index 91c146a20706b008480320570c23a5e3b74cf25b..78cb33be1eca77d8e70b33e28a0187eaafc00bc6 100644 (file)
--- a/suites/upgrade-dumpling/rbd/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
+++ b/suites/upgrade-dumpling/rbd/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
@@ -2,7 +2,7 @@ upgrade-sequence:
    sequential:
    - install.upgrade:
       all:
-         branch: dumpling
+         branch: emperor
    - ceph.restart: [osd.0]
    - sleep:
        duration: 30

diff --git a/suites/upgrade-dumpling/rgw/1-dumpling-install/v0.67.3.yaml b/suites/upgrade-dumpling/rgw/1-dumpling-install/v0.67.3.yaml
new file mode 100644 (file)
index 0000000..d0c1861
--- /dev/null
+++ b/suites/upgrade-dumpling/rgw/1-dumpling-install/v0.67.3.yaml
@@ -0,0 +1,7 @@
+tasks:
+- install:
+    tag: v0.67.3
+- ceph:
+- parallel:
+   - workload
+   - upgrade-sequence

diff --git a/suites/upgrade-dumpling/rgw/1-dumpling-install/v0.67.4.yaml b/suites/upgrade-dumpling/rgw/1-dumpling-install/v0.67.4.yaml
new file mode 100644 (file)
index 0000000..4e7d7c5
--- /dev/null
+++ b/suites/upgrade-dumpling/rgw/1-dumpling-install/v0.67.4.yaml
@@ -0,0 +1,7 @@
+tasks:
+- install:
+    tag: v0.67.4
+- ceph:
+- parallel:
+   - workload
+   - upgrade-sequence

diff --git a/suites/upgrade-dumpling/rgw/3-upgrade-sequence/upgrade-mds-mon-osd.yaml b/suites/upgrade-dumpling/rgw/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
index ff9129046e13065e431d2019f84208d953dfba3a..0ae6f9280962e03106eb5ce390ac82fc6a59d458 100644 (file)
--- a/suites/upgrade-dumpling/rgw/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
+++ b/suites/upgrade-dumpling/rgw/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
@@ -2,7 +2,7 @@ upgrade-sequence:
    sequential:
    - install.upgrade:
       all:
-         branch: dumpling
+         branch: emperor
    - ceph.restart: [mds.a]
    - sleep:
        duration: 60

diff --git a/suites/upgrade-dumpling/rgw/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade-dumpling/rgw/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
index 75face28d88812a5a5c2e006bacbee140f24955e..3f0aad2ec86939d73bdb60b9c1674e51a956e565 100644 (file)
--- a/suites/upgrade-dumpling/rgw/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ b/suites/upgrade-dumpling/rgw/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
@@ -2,7 +2,7 @@ upgrade-sequence:
    sequential:
    - install.upgrade:
       all:
-         branch: dumpling
+         branch: emperor
    - ceph.restart: [mon.a]
    - sleep:
        duration: 60

diff --git a/suites/upgrade-dumpling/rgw/3-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade-dumpling/rgw/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
index a08c669bf9ef0cfbf8b0de45b577c606ead4f1c5..622b02d4271414e11e41f31ecb2c0d302f4e9519 100644 (file)
--- a/suites/upgrade-dumpling/rgw/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
+++ b/suites/upgrade-dumpling/rgw/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
@@ -2,7 +2,7 @@ upgrade-sequence:
    sequential:
    - install.upgrade:
       all:
-         branch: dumpling
+         branch: emperor
    - ceph.restart: [osd.0]
    - sleep:
        duration: 30

diff --git a/suites/upgrade-fs/fs/6-upgrade-to-emperor/emperor.yaml b/suites/upgrade-fs/fs/6-upgrade-to-emperor/emperor.yaml
new file mode 100644 (file)
index 0000000..e473f31
--- /dev/null
+++ b/suites/upgrade-fs/fs/6-upgrade-to-emperor/emperor.yaml
@@ -0,0 +1,4 @@
+tasks:
+- install.upgrade:
+     all:
+        branch: emperor

diff --git a/suites/upgrade-fs/fs/7-restart/mds-mon-osd.yaml b/suites/upgrade-fs/fs/7-restart/mds-mon-osd.yaml
new file mode 100644 (file)
index 0000000..d218006
--- /dev/null
+++ b/suites/upgrade-fs/fs/7-restart/mds-mon-osd.yaml
@@ -0,0 +1,2 @@
+tasks:
+- ceph.restart: [mds.a, mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3]

diff --git a/suites/upgrade-fs/fs/7-restart/mon-mds-osd.yaml b/suites/upgrade-fs/fs/7-restart/mon-mds-osd.yaml
new file mode 100644 (file)
index 0000000..78e14e9
--- /dev/null
+++ b/suites/upgrade-fs/fs/7-restart/mon-mds-osd.yaml
@@ -0,0 +1,2 @@
+tasks:
+- ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3]

diff --git a/suites/upgrade-fs/fs/7-restart/osd-mds-mon.yaml b/suites/upgrade-fs/fs/7-restart/osd-mds-mon.yaml
new file mode 100644 (file)
index 0000000..dbcd013
--- /dev/null
+++ b/suites/upgrade-fs/fs/7-restart/osd-mds-mon.yaml
@@ -0,0 +1,2 @@
+tasks:
+- ceph.restart: [osd.0, osd.1, osd.2, osd.3, mds.a, mon.a, mon.b, mon.c]

diff --git a/suites/upgrade-fs/fs/8-emperor-workload/blogbench.yaml b/suites/upgrade-fs/fs/8-emperor-workload/blogbench.yaml
new file mode 100644 (file)
index 0000000..4e54068
--- /dev/null
+++ b/suites/upgrade-fs/fs/8-emperor-workload/blogbench.yaml
@@ -0,0 +1,6 @@
+tasks:
+- workunit:
+     branch: emperor
+     clients:
+        client.0:
+           - suites/blogbench.sh

diff --git a/suites/upgrade-fs/fs/8-emperor-workload/dbench.yaml b/suites/upgrade-fs/fs/8-emperor-workload/dbench.yaml
new file mode 100644 (file)
index 0000000..365ba9a
--- /dev/null
+++ b/suites/upgrade-fs/fs/8-emperor-workload/dbench.yaml
@@ -0,0 +1,6 @@
+tasks:
+- workunit:
+     branch: emperor
+     clients:
+        all:
+           - suites/dbench.sh

diff --git a/suites/upgrade-fs/fs/8-emperor-workload/iogen.yaml b/suites/upgrade-fs/fs/8-emperor-workload/iogen.yaml
new file mode 100644 (file)
index 0000000..994fa87
--- /dev/null
+++ b/suites/upgrade-fs/fs/8-emperor-workload/iogen.yaml
@@ -0,0 +1,6 @@
+tasks:
+- workunit:
+     branch: emperor
+     clients:
+        client.0:
+           - suites/iogen.sh

diff --git a/suites/upgrade-parallel/fs/3-upgrade-sequence/upgrade-all.yaml b/suites/upgrade-parallel/fs/3-upgrade-sequence/upgrade-all.yaml
index f25b98eddca1885d58c3f539bbaa4561c8ee317e..4cb05ce8777f4f0df77800c262423368c3eac171 100644 (file)
--- a/suites/upgrade-parallel/fs/3-upgrade-sequence/upgrade-all.yaml
+++ b/suites/upgrade-parallel/fs/3-upgrade-sequence/upgrade-all.yaml
@@ -2,4 +2,5 @@ upgrade-sequence:
    sequential:
    - install.upgrade:
       all:
+         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-parallel/rados/3-upgrade-sequence/upgrade-all.yaml b/suites/upgrade-parallel/rados/3-upgrade-sequence/upgrade-all.yaml
index f25b98eddca1885d58c3f539bbaa4561c8ee317e..4cb05ce8777f4f0df77800c262423368c3eac171 100644 (file)
--- a/suites/upgrade-parallel/rados/3-upgrade-sequence/upgrade-all.yaml
+++ b/suites/upgrade-parallel/rados/3-upgrade-sequence/upgrade-all.yaml
@@ -2,4 +2,5 @@ upgrade-sequence:
    sequential:
    - install.upgrade:
       all:
+         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-parallel/rados/3-upgrade-sequence/upgrade-mds-mon-osd.yaml b/suites/upgrade-parallel/rados/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
index df65c74e385d592fcba29c3d51121e485cbc109f..717f778e45899146951d2859b02b670a99d616d1 100644 (file)
--- a/suites/upgrade-parallel/rados/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
+++ b/suites/upgrade-parallel/rados/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
@@ -2,6 +2,7 @@ upgrade-sequence:
    sequential:
    - install.upgrade:
       all:
+         branch: emperor
    - ceph.restart: [mds.a]
    - sleep:
        duration: 60

diff --git a/suites/upgrade-parallel/rados/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade-parallel/rados/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
index 25eb6e48413fc75f34b1db06ae25efd93e4476be..8ad7503bb6326ee9d968e53d4e7f599220bb3feb 100644 (file)
--- a/suites/upgrade-parallel/rados/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ b/suites/upgrade-parallel/rados/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
@@ -2,6 +2,7 @@ upgrade-sequence:
    sequential:
    - install.upgrade:
       all:
+         branch: emperor
    - ceph.restart:
        daemons: [mon.a]
        wait-for-healthy: false

diff --git a/suites/upgrade-parallel/rados/3-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade-parallel/rados/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
index e497800d547a211cb39d68916486a356b726841e..a3607dbcb5c8d7187639f377803fdded25c4d184 100644 (file)
--- a/suites/upgrade-parallel/rados/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
+++ b/suites/upgrade-parallel/rados/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
@@ -2,6 +2,7 @@ upgrade-sequence:
    sequential:
    - install.upgrade:
       all:
+         branch: emperor
    - ceph.restart: [osd.0]
    - sleep:
        duration: 60

diff --git a/suites/upgrade-parallel/rgw/3-upgrade-sequence/upgrade-all.yaml b/suites/upgrade-parallel/rgw/3-upgrade-sequence/upgrade-all.yaml
index bd62b3a1b8e11d804c2b8e38c8f4fe9e8f1a87a8..23740967edf71729e1e664e7bf7640a9e024626a 100644 (file)
--- a/suites/upgrade-parallel/rgw/3-upgrade-sequence/upgrade-all.yaml
+++ b/suites/upgrade-parallel/rgw/3-upgrade-sequence/upgrade-all.yaml
@@ -2,4 +2,5 @@ upgrade-sequence:
    sequential:
    - install.upgrade:
       all:
+         branch: emperor
    - ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3, rgw.client.0]

diff --git a/suites/upgrade-small/fs/3-upgrade-sequence/upgrade-all.yaml b/suites/upgrade-small/fs/3-upgrade-sequence/upgrade-all.yaml
index 37bbb0f440d4ccf6d5861e2c56c57c03f7b1c9f4..e473f31862db0d2427a752c60c521199eee54243 100644 (file)
--- a/suites/upgrade-small/fs/3-upgrade-sequence/upgrade-all.yaml
+++ b/suites/upgrade-small/fs/3-upgrade-sequence/upgrade-all.yaml
@@ -1,4 +1,4 @@
 tasks:
 - install.upgrade:
      all:
-
+        branch: emperor

diff --git a/suites/upgrade-small/fs/5-emperor-workload/emperor.yaml b/suites/upgrade-small/fs/5-emperor-workload/emperor.yaml
new file mode 100644 (file)
index 0000000..3f54d54
--- /dev/null
+++ b/suites/upgrade-small/fs/5-emperor-workload/emperor.yaml
@@ -0,0 +1,6 @@
+tasks:
+- workunit:
+     branch: emperor
+     clients:
+        client.0:
+           - suites/dbench.sh

diff --git a/suites/upgrade-small/fs/5-next-workload/next.yaml b/suites/upgrade-small/fs/5-next-workload/next.yaml
deleted file mode 100644 (file)
index 7b22b6f..0000000
--- a/suites/upgrade-small/fs/5-next-workload/next.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-     clients:
-        client.0:
-           - suites/dbench.sh

diff --git a/suites/upgrade-small/rados/3-upgrade-sequence/upgrade.yaml b/suites/upgrade-small/rados/3-upgrade-sequence/upgrade.yaml
index bb34346801c652fb8f4f82677c6c22d1a1e45b6d..e473f31862db0d2427a752c60c521199eee54243 100644 (file)
--- a/suites/upgrade-small/rados/3-upgrade-sequence/upgrade.yaml
+++ b/suites/upgrade-small/rados/3-upgrade-sequence/upgrade.yaml
@@ -1,3 +1,4 @@
 tasks:
 - install.upgrade:
      all:
+        branch: emperor

diff --git a/suites/upgrade-small/rados/5-emperor-workload/emperor.yaml b/suites/upgrade-small/rados/5-emperor-workload/emperor.yaml
new file mode 100644 (file)
index 0000000..58d439c
--- /dev/null
+++ b/suites/upgrade-small/rados/5-emperor-workload/emperor.yaml
@@ -0,0 +1,6 @@
+tasks:
+- workunit:
+    branch: emperor
+    clients:
+      client.0:
+        - rados/test.sh

diff --git a/suites/upgrade-small/rados/5-next-workload/next.yaml b/suites/upgrade-small/rados/5-next-workload/next.yaml
deleted file mode 100644 (file)
index cd11ae6..0000000
--- a/suites/upgrade-small/rados/5-next-workload/next.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      client.0:
-        - rados/test.sh

diff --git a/suites/upgrade-small/rbd/3-upgrade-sequence/upgrade-all.yaml b/suites/upgrade-small/rbd/3-upgrade-sequence/upgrade-all.yaml
index bb34346801c652fb8f4f82677c6c22d1a1e45b6d..e473f31862db0d2427a752c60c521199eee54243 100644 (file)
--- a/suites/upgrade-small/rbd/3-upgrade-sequence/upgrade-all.yaml
+++ b/suites/upgrade-small/rbd/3-upgrade-sequence/upgrade-all.yaml
@@ -1,3 +1,4 @@
 tasks:
 - install.upgrade:
      all:
+        branch: emperor

diff --git a/suites/upgrade-small/rbd/5-emperor-workload/final.yaml b/suites/upgrade-small/rbd/5-emperor-workload/final.yaml
new file mode 100644 (file)
index 0000000..19b5bd3
--- /dev/null
+++ b/suites/upgrade-small/rbd/5-emperor-workload/final.yaml
@@ -0,0 +1,6 @@
+tasks:
+- workunit:
+     branch: emperor
+     clients:
+        client.0:
+           - cls/test_cls_rbd.sh

diff --git a/suites/upgrade-small/rbd/5-next-workload/final.yaml b/suites/upgrade-small/rbd/5-next-workload/final.yaml
deleted file mode 100644 (file)
index 9d62a69..0000000
--- a/suites/upgrade-small/rbd/5-next-workload/final.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-     clients:
-        client.0:
-           - cls/test_cls_rbd.sh

diff --git a/suites/upgrade-small/rgw/3-upgrade-sequence/upgrade-all.yaml b/suites/upgrade-small/rgw/3-upgrade-sequence/upgrade-all.yaml
index bb34346801c652fb8f4f82677c6c22d1a1e45b6d..e473f31862db0d2427a752c60c521199eee54243 100644 (file)
--- a/suites/upgrade-small/rgw/3-upgrade-sequence/upgrade-all.yaml
+++ b/suites/upgrade-small/rgw/3-upgrade-sequence/upgrade-all.yaml
@@ -1,3 +1,4 @@
 tasks:
 - install.upgrade:
      all:
+        branch: emperor

diff --git a/suites/upgrade-small/rgw/5-emperor-workload/final.yaml b/suites/upgrade-small/rgw/5-emperor-workload/final.yaml
new file mode 100644 (file)
index 0000000..ff9cda2
--- /dev/null
+++ b/suites/upgrade-small/rgw/5-emperor-workload/final.yaml
@@ -0,0 +1,5 @@
+tasks:
+- s3tests:
+    force-branch: emperor
+    client.0:
+      rgw_server: client.0

diff --git a/suites/upgrade-small/rgw/5-next-workload/final.yaml b/suites/upgrade-small/rgw/5-next-workload/final.yaml
deleted file mode 100644 (file)
index 573cffb..0000000
--- a/suites/upgrade-small/rgw/5-next-workload/final.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- s3tests:
-    client.0:
-      rgw_server: client.0

diff --git a/suites/upgrade/rados/6-upgrade-emp/emperor.yaml b/suites/upgrade/rados/6-upgrade-emp/emperor.yaml
new file mode 100644 (file)
index 0000000..e473f31
--- /dev/null
+++ b/suites/upgrade/rados/6-upgrade-emp/emperor.yaml
@@ -0,0 +1,4 @@
+tasks:
+- install.upgrade:
+     all:
+        branch: emperor

diff --git a/suites/upgrade/rados/7-restart/upgrade_mds_mon_osd.yaml b/suites/upgrade/rados/7-restart/upgrade_mds_mon_osd.yaml
new file mode 100644 (file)
index 0000000..d218006
--- /dev/null
+++ b/suites/upgrade/rados/7-restart/upgrade_mds_mon_osd.yaml
@@ -0,0 +1,2 @@
+tasks:
+- ceph.restart: [mds.a, mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3]

diff --git a/suites/upgrade/rados/7-restart/upgrade_mds_osd_mon.yaml b/suites/upgrade/rados/7-restart/upgrade_mds_osd_mon.yaml
new file mode 100644 (file)
index 0000000..a850835
--- /dev/null
+++ b/suites/upgrade/rados/7-restart/upgrade_mds_osd_mon.yaml
@@ -0,0 +1,2 @@
+tasks:
+- ceph.restart: [mds.a, osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c]

diff --git a/suites/upgrade/rados/7-restart/upgrade_mon_mds_osd.yaml b/suites/upgrade/rados/7-restart/upgrade_mon_mds_osd.yaml
new file mode 100644 (file)
index 0000000..78e14e9
--- /dev/null
+++ b/suites/upgrade/rados/7-restart/upgrade_mon_mds_osd.yaml
@@ -0,0 +1,2 @@
+tasks:
+- ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3]

diff --git a/suites/upgrade/rados/7-restart/upgrade_mon_osd_mds.yaml b/suites/upgrade/rados/7-restart/upgrade_mon_osd_mds.yaml
new file mode 100644 (file)
index 0000000..31a79e4
--- /dev/null
+++ b/suites/upgrade/rados/7-restart/upgrade_mon_osd_mds.yaml
@@ -0,0 +1,2 @@
+tasks:
+- ceph.restart: [mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3, mds.a]

diff --git a/suites/upgrade/rados/7-restart/upgrade_osd_mds_mon.yaml b/suites/upgrade/rados/7-restart/upgrade_osd_mds_mon.yaml
new file mode 100644 (file)
index 0000000..dbcd013
--- /dev/null
+++ b/suites/upgrade/rados/7-restart/upgrade_osd_mds_mon.yaml
@@ -0,0 +1,2 @@
+tasks:
+- ceph.restart: [osd.0, osd.1, osd.2, osd.3, mds.a, mon.a, mon.b, mon.c]

diff --git a/suites/upgrade/rados/7-restart/upgrade_osd_mon_mds.yaml b/suites/upgrade/rados/7-restart/upgrade_osd_mon_mds.yaml
new file mode 100644 (file)
index 0000000..e8fe288
--- /dev/null
+++ b/suites/upgrade/rados/7-restart/upgrade_osd_mon_mds.yaml
@@ -0,0 +1,2 @@
+tasks:
+- ceph.restart: [osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c, mds.a]

diff --git a/suites/upgrade/rados/8-emperor-workload/api.yaml b/suites/upgrade/rados/8-emperor-workload/api.yaml
new file mode 100644 (file)
index 0000000..29a4be1
--- /dev/null
+++ b/suites/upgrade/rados/8-emperor-workload/api.yaml
@@ -0,0 +1,7 @@
+tasks:
+- workunit:
+    branch: emperor
+    clients:
+      client.0:
+        - rados/test.sh
+        - cls

diff --git a/suites/upgrade/rados/8-emperor-workload/snaps-few-objects.yaml b/suites/upgrade/rados/8-emperor-workload/snaps-few-objects.yaml
new file mode 100644 (file)
index 0000000..c540397
--- /dev/null
+++ b/suites/upgrade/rados/8-emperor-workload/snaps-few-objects.yaml
@@ -0,0 +1,12 @@
+tasks:
+- rados:
+    clients: [client.0]
+    ops: 4000
+    objects: 50
+    op_weights:
+      read: 100
+      write: 100
+      delete: 50
+      snap_create: 50
+      snap_remove: 50
+      rollback: 50

diff --git a/suites/upgrade/rbd/5-upgrade-to-emperor/upgrade.yaml b/suites/upgrade/rbd/5-upgrade-to-emperor/upgrade.yaml
new file mode 100644 (file)
index 0000000..e473f31
--- /dev/null
+++ b/suites/upgrade/rbd/5-upgrade-to-emperor/upgrade.yaml
@@ -0,0 +1,4 @@
+tasks:
+- install.upgrade:
+     all:
+        branch: emperor

diff --git a/suites/upgrade/rbd/6-restart/mon-osd-mds.yaml b/suites/upgrade/rbd/6-restart/mon-osd-mds.yaml
new file mode 100644 (file)
index 0000000..31a79e4
--- /dev/null
+++ b/suites/upgrade/rbd/6-restart/mon-osd-mds.yaml
@@ -0,0 +1,2 @@
+tasks:
+- ceph.restart: [mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3, mds.a]

diff --git a/suites/upgrade/rbd/6-restart/osd-mon-mds.yaml b/suites/upgrade/rbd/6-restart/osd-mon-mds.yaml
new file mode 100644 (file)
index 0000000..e8fe288
--- /dev/null
+++ b/suites/upgrade/rbd/6-restart/osd-mon-mds.yaml
@@ -0,0 +1,2 @@
+tasks:
+- ceph.restart: [osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c, mds.a]

diff --git a/suites/upgrade/rbd/7-emperor-workload/import_export.yaml b/suites/upgrade/rbd/7-emperor-workload/import_export.yaml
new file mode 100644 (file)
index 0000000..e297887
--- /dev/null
+++ b/suites/upgrade/rbd/7-emperor-workload/import_export.yaml
@@ -0,0 +1,8 @@
+tasks:
+- workunit:
+     branch: emperor
+     clients:
+        client.0:
+           - rbd/import_export.sh
+     env:
+        RBD_CREATE_ARGS: --new-format

diff --git a/suites/upgrade/rgw/5-upgrade-to-emperor/upgrade.yaml b/suites/upgrade/rgw/5-upgrade-to-emperor/upgrade.yaml
new file mode 100644 (file)
index 0000000..e473f31
--- /dev/null
+++ b/suites/upgrade/rgw/5-upgrade-to-emperor/upgrade.yaml
@@ -0,0 +1,4 @@
+tasks:
+- install.upgrade:
+     all:
+        branch: emperor

diff --git a/suites/upgrade/rgw/6-restart/mon-osd-mds.yaml b/suites/upgrade/rgw/6-restart/mon-osd-mds.yaml
new file mode 100644 (file)
index 0000000..ea8a58c
--- /dev/null
+++ b/suites/upgrade/rgw/6-restart/mon-osd-mds.yaml
@@ -0,0 +1,2 @@
+tasks:
+- ceph.restart: [mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3, mds.a, rgw.client.0]

diff --git a/suites/upgrade/rgw/6-restart/osd-mon-mds.yaml b/suites/upgrade/rgw/6-restart/osd-mon-mds.yaml
new file mode 100644 (file)
index 0000000..f9606ef
--- /dev/null
+++ b/suites/upgrade/rgw/6-restart/osd-mon-mds.yaml
@@ -0,0 +1,2 @@
+tasks:
+- ceph.restart: [osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c, mds.a, rgw.client.0]

diff --git a/suites/upgrade/rgw/7-emperor-workload/readwrite.yaml b/suites/upgrade/rgw/7-emperor-workload/readwrite.yaml
new file mode 100644 (file)
index 0000000..d3166f1
--- /dev/null
+++ b/suites/upgrade/rgw/7-emperor-workload/readwrite.yaml
@@ -0,0 +1,13 @@
+tasks:
+- s3readwrite:
+    client.0:
+      rgw_server: client.0
+      readwrite:
+        bucket: rwtest
+        readers: 10
+        writers: 3
+        duration: 300
+        files:
+          num: 10
+          size: 2000
+          stddev: 500

diff --git a/suites/upgrade/rgw/7-emperor-workload/s3tests.yaml b/suites/upgrade/rgw/7-emperor-workload/s3tests.yaml
new file mode 100644 (file)
index 0000000..cc9675c
--- /dev/null
+++ b/suites/upgrade/rgw/7-emperor-workload/s3tests.yaml
@@ -0,0 +1,5 @@
+tasks:
+- s3tests:
+    client.0:
+      force-branch: emperor
+      rgw_server: client.0

diff --git a/suites/upgrade/rgw/7-emperor-workload/swift.yaml b/suites/upgrade/rgw/7-emperor-workload/swift.yaml
new file mode 100644 (file)
index 0000000..45e2fc9
--- /dev/null
+++ b/suites/upgrade/rgw/7-emperor-workload/swift.yaml
@@ -0,0 +1,4 @@
+tasks:
+- swift:
+    client.0:
+      rgw_server: client.0

diff --git a/suites/upgrade/singleton/all/upgrade-dumpling-emperor.yaml b/suites/upgrade/singleton/all/upgrade-dumpling-emperor.yaml
new file mode 100644 (file)
index 0000000..755e673
--- /dev/null
+++ b/suites/upgrade/singleton/all/upgrade-dumpling-emperor.yaml
@@ -0,0 +1,31 @@
+roles:
+- - mon.a
+  - mds.0
+  - osd.0
+  - osd.1
+- - mon.b
+  - osd.2
+  - osd.3
+- - client.0
+
+tasks:
+- install:
+     branch: dumpling
+- ceph:
+    conf:
+      mds:
+        debug mds: 20
+        debug ms: 1
+      client:
+        debug ms: 1
+        debug client: 20
+- install.upgrade:
+     all:
+        branch: emperor
+- ceph.restart:
+- ceph-fuse: [client.0]
+- workunit:
+     clients:
+        client.0:
+           - suites/dbench.sh
+

diff --git a/suites/upgrade/singleton/all/upgrade-dumpling-next.yaml b/suites/upgrade/singleton/all/upgrade-dumpling-next.yaml
deleted file mode 100644 (file)
index a627770..0000000
--- a/suites/upgrade/singleton/all/upgrade-dumpling-next.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-roles:
-- - mon.a
-  - mds.0
-  - osd.0
-  - osd.1
-- - mon.b
-  - osd.2
-  - osd.3
-- - client.0
-
-tasks:
-- install:
-     branch: dumpling
-- ceph:
-    conf:
-      mds:
-        debug mds: 20
-        debug ms: 1
-      client:
-        debug ms: 1
-        debug client: 20
-- install.upgrade:
-     all:
-- ceph.restart:
-- ceph-fuse: [client.0]
-- workunit:
-     clients:
-        client.0:
-           - suites/dbench.sh
-