upgrade/dumpling-firefly-x: rename final upgrade yamls; expect quorum

The difference is whether we upgrade all at once or each individually.

Also, expect a quorum between a mix of dumpling and firefly monitors.

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

diff --git a/suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/upgrade-all.yaml b/suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/upgrade-all.yaml
deleted file mode 100644 (file)
index b239079..0000000
--- a/suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/upgrade-all.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-       mon.a:
-   - print: "**** done install.upgrade mon.a to the version from teuthology-suite arg"
-# upgrade step will be set to 'next' or 'master' from teuthology-suite comman line
-#         branch: firefly
-   - install.upgrade:
-       mon.b:
-   - print: "**** done install.upgrade mon.b to the version from teuthology-suite arg"
-#         branch: firefly
-   - install.upgrade:
-       client.0:
-   - print: "**** done install.upgrade client.0 to the version from teuthology-suite arg"
-#         branch: firefly
-   - ceph.restart:
-       daemons: [mon.a, mon.b, mon.c]
-       wait-for-healthy: true
-   - sleep:
-       duration: 60
-   - ceph.restart:
-       daemons: [osd.0, osd.1, osd.2, osd.3]
-       wait-for-healthy: true
-   - sleep:
-       duration: 60
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60
-   - exec:
-      mon.a:
-        - ceph osd crush tunables firefly

diff --git a/suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/upgrade-by-daemon.yaml b/suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/upgrade-by-daemon.yaml
new file mode 100644 (file)
index 0000000..6170563
--- /dev/null
+++ b/suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/upgrade-by-daemon.yaml
@@ -0,0 +1,38 @@
+upgrade-sequence:
+   sequential:
+   - install.upgrade:
+       mon.a:
+   - print: "**** done install.upgrade mon.a to the version from teuthology-suite arg"
+   - install.upgrade:
+       mon.b:
+   - print: "**** done install.upgrade mon.b to the version from teuthology-suite arg"
+   - install.upgrade:
+       client.0:
+   - print: "**** done install.upgrade client.0 to the version from teuthology-suite arg"
+   - ceph.restart:
+       daemons: [mon.a]
+   - sleep:
+       duration: 60
+   - ceph.restart:
+       daemons: [mon.b]
+   - sleep:
+       duration: 60
+   - ceph.restart: [mon.c]
+   - sleep:
+       duration: 60
+   - ceph.restart: [osd.0]
+   - sleep:
+       duration: 60
+   - ceph.restart: [osd.1]
+   - sleep:
+       duration: 60
+   - ceph.restart: [osd.2]
+   - sleep:
+       duration: 60
+   - ceph.restart: [osd.3]
+   - sleep:
+       duration: 60
+   - ceph.restart: [mds.a]
+   - exec:
+      mon.a:
+        - ceph osd crush tunables firefly

diff --git a/suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/upgrade-by-type.yaml b/suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/upgrade-by-type.yaml
new file mode 100644 (file)
index 0000000..aba8474
--- /dev/null
+++ b/suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/upgrade-by-type.yaml
@@ -0,0 +1,27 @@
+upgrade-sequence:
+   sequential:
+   - install.upgrade:
+       mon.a:
+   - print: "**** done install.upgrade mon.a to the version from teuthology-suite arg"
+   - install.upgrade:
+       mon.b:
+   - print: "**** done install.upgrade mon.b to the version from teuthology-suite arg"
+   - install.upgrade:
+       client.0:
+   - print: "**** done install.upgrade client.0 to the version from teuthology-suite arg"
+   - ceph.restart:
+       daemons: [mon.a, mon.b, mon.c]
+       wait-for-healthy: true
+   - sleep:
+       duration: 60
+   - ceph.restart:
+       daemons: [osd.0, osd.1, osd.2, osd.3]
+       wait-for-healthy: true
+   - sleep:
+       duration: 60
+   - ceph.restart: [mds.a]
+   - sleep:
+       duration: 60
+   - exec:
+      mon.a:
+        - ceph osd crush tunables firefly

diff --git a/suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/upgrade-mon-osd-mds.yaml
deleted file mode 100644 (file)
index ffcfa34..0000000
--- a/suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-       mon.a:
-   - print: "**** done install.upgrade mon.a to the version from teuthology-suite arg"
-# upgrade step will be set to 'next' or 'master' from teuthology-suite comman line
-#         branch: firefly
-   - install.upgrade:
-       mon.b:
-   - print: "**** done install.upgrade mon.b to the version from teuthology-suite arg"
-#         branch: firefly
-   - install.upgrade:
-       client.0:
-   - print: "**** done install.upgrade client.0 to the version from teuthology-suite arg"
-#         branch: firefly
-   - ceph.restart:
-       daemons: [mon.a]
-       wait-for-healthy: false
-       wait-for-osds-up: true
-   - sleep:
-       duration: 60
-   - ceph.restart:
-       daemons: [mon.b]
-       wait-for-healthy: false
-       wait-for-osds-up: true
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.3]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mds.a]
-   - exec:
-      mon.a:
-        - ceph osd crush tunables firefly