upgrade/dumpling: upgrade to latest dumpling, not emperor

Signed-off-by: Sage Weil <sage@inktank.com>

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 520dc4b30cf1f04055f436db1a400e00cc2c1b44..38bba91895d86759c6b031e728371415f86d8987 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: emperor
+         branch: dumpling
    - 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 e11f8c3b13fd37ca18b23380c46f840736137da0..5b617fdfd5ac3be930121a0bcd1b4748a40d5547 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: emperor
+         branch: dumpling
    - 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 78cb33be1eca77d8e70b33e28a0187eaafc00bc6..91c146a20706b008480320570c23a5e3b74cf25b 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: emperor
+         branch: dumpling
    - ceph.restart: [osd.0]
    - sleep:
        duration: 30

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 520dc4b30cf1f04055f436db1a400e00cc2c1b44..38bba91895d86759c6b031e728371415f86d8987 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: emperor
+         branch: dumpling
    - 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 e11f8c3b13fd37ca18b23380c46f840736137da0..5b617fdfd5ac3be930121a0bcd1b4748a40d5547 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: emperor
+         branch: dumpling
    - 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 f0fa4b886c590c57e6193bd4f16f74d443aa1bd9..801bab9f1f0de62b44ee1c16211e181f8407c9f9 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: emperor
+         branch: dumpling
    - ceph.restart: [osd.0]
    - sleep:
        duration: 30

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 520dc4b30cf1f04055f436db1a400e00cc2c1b44..38bba91895d86759c6b031e728371415f86d8987 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: emperor
+         branch: dumpling
    - 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 e11f8c3b13fd37ca18b23380c46f840736137da0..5b617fdfd5ac3be930121a0bcd1b4748a40d5547 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: emperor
+         branch: dumpling
    - 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 78cb33be1eca77d8e70b33e28a0187eaafc00bc6..91c146a20706b008480320570c23a5e3b74cf25b 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: emperor
+         branch: dumpling
    - ceph.restart: [osd.0]
    - sleep:
        duration: 30

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 0ae6f9280962e03106eb5ce390ac82fc6a59d458..ff9129046e13065e431d2019f84208d953dfba3a 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: emperor
+         branch: dumpling
    - 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 3f0aad2ec86939d73bdb60b9c1674e51a956e565..75face28d88812a5a5c2e006bacbee140f24955e 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: emperor
+         branch: dumpling
    - 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 622b02d4271414e11e41f31ecb2c0d302f4e9519..a08c669bf9ef0cfbf8b0de45b577c606ead4f1c5 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: emperor
+         branch: dumpling
    - ceph.restart: [osd.0]
    - sleep:
        duration: 30