modified upgrade tasks to run from cuttlefish to dumpling, dumpling to next

and bobtail to dumpling

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

diff --git a/suites/upgrade/mixed-cluster/3-partial-osds-upgrade/dumpling.yaml b/suites/upgrade/mixed-cluster/3-partial-osds-upgrade/dumpling.yaml
new file mode 100644 (file)
index 0000000..a9b9bf8
--- /dev/null
+++ b/suites/upgrade/mixed-cluster/3-partial-osds-upgrade/dumpling.yaml
@@ -0,0 +1,7 @@
+tasks:
+- install.upgrade:
+     osd.0:
+        branch: dumpling
+     osd.2:
+        branch: dumpling
+

diff --git a/suites/upgrade/mixed-cluster/3-partial-osds-upgrade/next.yaml b/suites/upgrade/mixed-cluster/3-partial-osds-upgrade/next.yaml
deleted file mode 100644 (file)
index 4f1d5d0..0000000
--- a/suites/upgrade/mixed-cluster/3-partial-osds-upgrade/next.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install.upgrade:
-     osd.0:
-        branch: next
-     osd.2:
-        branch: next
-

diff --git a/suites/upgrade/mixed-mons/3-partial-mon-upgrade/dumpling.yaml b/suites/upgrade/mixed-mons/3-partial-mon-upgrade/dumpling.yaml
new file mode 100644 (file)
index 0000000..6c9d320
--- /dev/null
+++ b/suites/upgrade/mixed-mons/3-partial-mon-upgrade/dumpling.yaml
@@ -0,0 +1,4 @@
+tasks:
+- install.upgrade:
+     mon.a:
+        branch: dumpling

diff --git a/suites/upgrade/mixed-mons/3-partial-mon-upgrade/next.yaml b/suites/upgrade/mixed-mons/3-partial-mon-upgrade/next.yaml
deleted file mode 100644 (file)
index 2910abc..0000000
--- a/suites/upgrade/mixed-mons/3-partial-mon-upgrade/next.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- install.upgrade:
-     mon.a:
-        branch: next

diff --git a/suites/upgrade/rados-double/3-upgrade/cuttlefish.yaml b/suites/upgrade/rados-double/3-upgrade/cuttlefish.yaml
deleted file mode 100644 (file)
index 4dee94e..0000000
--- a/suites/upgrade/rados-double/3-upgrade/cuttlefish.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- install.upgrade:
-     all:
-        branch: cuttlefish

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

diff --git a/suites/upgrade/rados-double/5-cuttlefish-workload/api.yaml b/suites/upgrade/rados-double/5-cuttlefish-workload/api.yaml
index 66526582579d90736a263379276884e48a38df26..9b9f1f2e675d5da6d89e137f46368f509a769b67 100644 (file)
--- a/suites/upgrade/rados-double/5-cuttlefish-workload/api.yaml
+++ b/suites/upgrade/rados-double/5-cuttlefish-workload/api.yaml
@@ -1,6 +1,5 @@
 tasks:
 - workunit:
-    branch: cuttlefish
     clients:
       client.0:
         - rados/test.sh

diff --git a/suites/upgrade/rados-double/5-cuttlefish-workload/load-gen-mix.yaml b/suites/upgrade/rados-double/5-cuttlefish-workload/load-gen-mix.yaml
index 7ec655c8ccfcb026ed38bc67f6eec12700ab2fbb..60a44cd4ff0e2f8a0fc55a03511ed6544a5597f7 100644 (file)
--- a/suites/upgrade/rados-double/5-cuttlefish-workload/load-gen-mix.yaml
+++ b/suites/upgrade/rados-double/5-cuttlefish-workload/load-gen-mix.yaml
@@ -1,6 +1,5 @@
 tasks:
 - workunit:
-    branch: cuttlefish
     clients:
       client.0:
         - rados/load-gen-mix.sh

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

diff --git a/suites/upgrade/rados/3-upgrade/next.yaml b/suites/upgrade/rados/3-upgrade/next.yaml
deleted file mode 100644 (file)
index 3e8e04c..0000000
--- a/suites/upgrade/rados/3-upgrade/next.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- install.upgrade:
-     all:
-        branch: next

diff --git a/suites/upgrade/rados/5-next-workload/api.yaml b/suites/upgrade/rados/5-next-workload/api.yaml
index 294713cf2e490a160253d0a0aa6b3ed451921ace..9b9f1f2e675d5da6d89e137f46368f509a769b67 100644 (file)
--- a/suites/upgrade/rados/5-next-workload/api.yaml
+++ b/suites/upgrade/rados/5-next-workload/api.yaml
@@ -1,6 +1,5 @@
 tasks:
 - workunit:
-    branch: next
     clients:
       client.0:
         - rados/test.sh

diff --git a/suites/upgrade/rbd-double/3-upgrade/cuttlefish.yaml b/suites/upgrade/rbd-double/3-upgrade/cuttlefish.yaml
deleted file mode 100644 (file)
index 4dee94e..0000000
--- a/suites/upgrade/rbd-double/3-upgrade/cuttlefish.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- install.upgrade:
-     all:
-        branch: cuttlefish

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

diff --git a/suites/upgrade/rbd-double/5-cuttlefish-workload/api.yaml b/suites/upgrade/rbd-double/5-cuttlefish-workload/api.yaml
deleted file mode 100644 (file)
index f0f81ff..0000000
--- a/suites/upgrade/rbd-double/5-cuttlefish-workload/api.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-     branch: cuttlefish 
-     clients:
-        client.0:
-           - rbd/test_librbd.sh

diff --git a/suites/upgrade/rbd-double/5-cuttlefish-workload/cls.yaml b/suites/upgrade/rbd-double/5-cuttlefish-workload/cls.yaml
deleted file mode 100644 (file)
index 520b584..0000000
--- a/suites/upgrade/rbd-double/5-cuttlefish-workload/cls.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-     branch: cuttlefish 
-     clients:
-        client.0:
-           - cls/test_cls_rbd.sh

diff --git a/suites/upgrade/rbd-double/5-dumpling-workload/api.yaml b/suites/upgrade/rbd-double/5-dumpling-workload/api.yaml
new file mode 100644 (file)
index 0000000..1ecaee4
--- /dev/null
+++ b/suites/upgrade/rbd-double/5-dumpling-workload/api.yaml
@@ -0,0 +1,5 @@
+tasks:
+- workunit:
+     clients:
+        client.0:
+           - rbd/test_librbd.sh

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

diff --git a/suites/upgrade/rbd/c/upgrade.yaml b/suites/upgrade/rbd/c/upgrade.yaml
index 3e8e04cadbf05dc27e2f64b252cf5130db377b65..e3e332c4f2285477ab27a11cc6561a2c709533df 100644 (file)
--- a/suites/upgrade/rbd/c/upgrade.yaml
+++ b/suites/upgrade/rbd/c/upgrade.yaml
@@ -1,4 +1,4 @@
 tasks:
 - install.upgrade:
      all:
-        branch: next
+        branch: dumpling

diff --git a/suites/upgrade/rbd/e/api.yaml b/suites/upgrade/rbd/e/api.yaml
index 405a4932dc173292bdb1b31ffeae7ff71df75d77..1ecaee4bf78fa103b95c9631de39718ce0d7d0bf 100644 (file)
--- a/suites/upgrade/rbd/e/api.yaml
+++ b/suites/upgrade/rbd/e/api.yaml
@@ -1,6 +1,5 @@
 tasks:
 - workunit:
-     branch: next
      clients:
         client.0:
            - rbd/test_librbd.sh

diff --git a/suites/upgrade/rbd/e/cls.yaml b/suites/upgrade/rbd/e/cls.yaml
index ee960fed0e4e525798d55211a48fe69101a9123c..9d62a693458247a8cda073f0415a47e1715a0a60 100644 (file)
--- a/suites/upgrade/rbd/e/cls.yaml
+++ b/suites/upgrade/rbd/e/cls.yaml
@@ -1,6 +1,5 @@
 tasks:
 - workunit:
-     branch: next
      clients:
         client.0:
            - cls/test_cls_rbd.sh

diff --git a/suites/upgrade/rbd/e/import-export.yaml b/suites/upgrade/rbd/e/import-export.yaml
index c603b532648b2cef2364fd692fcf0232c198e329..ae44a8738298b1b21c47fd645a3ee438778e9950 100644 (file)
--- a/suites/upgrade/rbd/e/import-export.yaml
+++ b/suites/upgrade/rbd/e/import-export.yaml
@@ -1,6 +1,5 @@
 tasks:
 - workunit:
-     branch: next
      clients:
         client.0:
            - rbd/import_export.sh

diff --git a/suites/upgrade/rbd/e/python.yaml b/suites/upgrade/rbd/e/python.yaml
index 8a98bc91fcc653435a611b20a3f5c739282aa0eb..5c6df6e38dd8083b658528b8d20898118e75557a 100644 (file)
--- a/suites/upgrade/rbd/e/python.yaml
+++ b/suites/upgrade/rbd/e/python.yaml
@@ -1,6 +1,5 @@
 tasks:
 - workunit:
-     branch: next
      clients:
         client.0:
            - rbd/test_librbd_python.sh

diff --git a/suites/upgrade/rgw-double/3-upgrade/cuttlefish.yaml b/suites/upgrade/rgw-double/3-upgrade/cuttlefish.yaml
deleted file mode 100644 (file)
index 4dee94e..0000000
--- a/suites/upgrade/rgw-double/3-upgrade/cuttlefish.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- install.upgrade:
-     all:
-        branch: cuttlefish

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

diff --git a/suites/upgrade/rgw-double/5-cuttlefish-workload/readwrite.yaml b/suites/upgrade/rgw-double/5-cuttlefish-workload/readwrite.yaml
deleted file mode 100644 (file)
index d3166f1..0000000
--- a/suites/upgrade/rgw-double/5-cuttlefish-workload/readwrite.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-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-double/5-cuttlefish-workload/s3tests.yaml b/suites/upgrade/rgw-double/5-cuttlefish-workload/s3tests.yaml
deleted file mode 100644 (file)
index 573cffb..0000000
--- a/suites/upgrade/rgw-double/5-cuttlefish-workload/s3tests.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- s3tests:
-    client.0:
-      rgw_server: client.0

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

diff --git a/suites/upgrade/rgw-double/5-dumpling-workload/readwrite.yaml b/suites/upgrade/rgw-double/5-dumpling-workload/readwrite.yaml
new file mode 100644 (file)
index 0000000..d3166f1
--- /dev/null
+++ b/suites/upgrade/rgw-double/5-dumpling-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-double/5-dumpling-workload/s3tests.yaml b/suites/upgrade/rgw-double/5-dumpling-workload/s3tests.yaml
new file mode 100644 (file)
index 0000000..573cffb
--- /dev/null
+++ b/suites/upgrade/rgw-double/5-dumpling-workload/s3tests.yaml
@@ -0,0 +1,4 @@
+tasks:
+- s3tests:
+    client.0:
+      rgw_server: client.0

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

diff --git a/suites/upgrade/rgw/c/upgrade.yaml b/suites/upgrade/rgw/c/upgrade.yaml
index 3e8e04cadbf05dc27e2f64b252cf5130db377b65..e3e332c4f2285477ab27a11cc6561a2c709533df 100644 (file)
--- a/suites/upgrade/rgw/c/upgrade.yaml
+++ b/suites/upgrade/rgw/c/upgrade.yaml
@@ -1,4 +1,4 @@
 tasks:
 - install.upgrade:
      all:
-        branch: next
+        branch: dumpling

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

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

diff --git a/suites/upgrade/singleton/all/upgrade-cuttlefish-dumpling.yaml b/suites/upgrade/singleton/all/upgrade-cuttlefish-dumpling.yaml
new file mode 100644 (file)
index 0000000..7f0eb33
--- /dev/null
+++ b/suites/upgrade/singleton/all/upgrade-cuttlefish-dumpling.yaml
@@ -0,0 +1,23 @@
+roles:
+- - mon.a
+  - mds.0
+  - osd.0
+  - osd.1
+- - mon.b
+  - osd.2
+  - osd.3
+- - client.0
+
+tasks:
+- install:
+     branch: cuttlefish
+- ceph:
+- install.upgrade:
+     all:
+        branch: dumpling
+- 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
new file mode 100644 (file)
index 0000000..4abb217
--- /dev/null
+++ b/suites/upgrade/singleton/all/upgrade-dumpling-next.yaml
@@ -0,0 +1,32 @@
+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: next
+- ceph.restart:
+- ceph-fuse: [client.0]
+- workunit:
+     branch: next
+     clients:
+        client.0:
+           - suites/dbench.sh
+