Removed 'firefly' branch name, upgrade step will be set to 'next' or 'master' from...

Signed-off-by: Yuri Weinstein <yuri.weinstein@inktank.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
index 282500bfddbeaf8e52893d0414d8afa9fcf3fdcf..be2fcab5a05c4c54aa204c682d282b4fefc4946e 100644 (file)
--- 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
@@ -2,11 +2,12 @@ upgrade-sequence:
    sequential:
    - install.upgrade:
        mon.a:
-         branch: firefly
+# upgrade step will be set to 'next' or 'master' from teuthology-suite comman line
+#         branch: firefly
        mon.b:
          branch: firefly
        client.0:
-         branch: firefly
+#         branch: firefly
    - ceph.restart:
        daemons: [mon.a, mon.b, mon.c]
        wait-for-healthy: true

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
index 3f737cc0de971996d072a0e7a697b29780e40c74..073887dbca2cf33407be88f778fe588669f254c1 100644 (file)
--- 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
@@ -2,11 +2,12 @@ upgrade-sequence:
    sequential:
    - install.upgrade:
        mon.a:
-         branch: firefly
+# upgrade step will be set to 'next' or 'master' from teuthology-suite comman line
+#         branch: firefly
        mon.b:
-         branch: firefly
+#         branch: firefly
        client.0:
-         branch: firefly
+#         branch: firefly
    - ceph.restart:
        daemons: [mon.a]
        wait-for-healthy: false