upgrade*: do not hard-code next as the final upgrade hop

The overrides for the job will have some branch; leave the target unspecified so that we use that as the target version. This will let us test upgrades to master and next (and whatever else, provided it is a forward hop). Signed-off-by: Sage Weil <sage@inktank.com>
2025-02-21 01:47:25 +00:00 · 2013-10-15 12:24:23 -07:00 · 2013-10-15 12:24:23 -07:00 · 5f5eb2b241
commit 5f5eb2b241
parent 80d9ac5c51
21 changed files with 0 additions and 22 deletions
--- a/suites/upgrade-parallel/fs/3-upgrade-sequence/upgrade-all.yaml
+++ b/suites/upgrade-parallel/fs/3-upgrade-sequence/upgrade-all.yaml
@ -2,5 +2,4 @@ upgrade-sequence:
   sequential:
   - install.upgrade:
      all:
-         branch: next
   - ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3]
--- a/suites/upgrade-parallel/rados/3-upgrade-sequence/upgrade-all.yaml
+++ b/suites/upgrade-parallel/rados/3-upgrade-sequence/upgrade-all.yaml
@ -2,5 +2,4 @@ upgrade-sequence:
   sequential:
   - install.upgrade:
      all:
-         branch: next
   - ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3]
--- 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,7 +2,6 @@ upgrade-sequence:
   sequential:
   - install.upgrade:
      all:
-         branch: next
   - ceph.restart: [mds.a]
   - sleep:
       duration: 60
--- 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,7 +2,6 @@ upgrade-sequence:
   sequential:
   - install.upgrade:
      all:
-         branch: next
   - ceph.restart:
       daemons: [mon.a]
       wait-for-healthy: false
--- 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,7 +2,6 @@ upgrade-sequence:
   sequential:
   - install.upgrade:
      all:
-         branch: next
   - ceph.restart: [osd.0]
   - sleep:
       duration: 60
--- a/suites/upgrade-parallel/rgw/3-upgrade-sequence/upgrade-all.yaml
+++ b/suites/upgrade-parallel/rgw/3-upgrade-sequence/upgrade-all.yaml
@ -2,5 +2,4 @@ upgrade-sequence:
   sequential:
   - install.upgrade:
      all:
-         branch: next
   - ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3, rgw.client.0]
--- a/suites/upgrade-parallel/stress-split/2-partial-upgrade/firsthalf.yaml
+++ b/suites/upgrade-parallel/stress-split/2-partial-upgrade/firsthalf.yaml
@ -1,6 +1,5 @@
 tasks:
 - install.upgrade:
    osd.0:
-      branch: next
 - ceph.restart:
    daemons: [osd.0, osd.1, osd.2]
--- a/suites/upgrade-small/fs/3-upgrade-sequence/upgrade-all.yaml
+++ b/suites/upgrade-small/fs/3-upgrade-sequence/upgrade-all.yaml
@ -1,5 +1,4 @@
 tasks:
 - install.upgrade:
     all:
-        branch: next 

--- a/suites/upgrade-small/rados/3-upgrade-sequence/upgrade.yaml
+++ b/suites/upgrade-small/rados/3-upgrade-sequence/upgrade.yaml
@ -1,4 +1,3 @@
 tasks:
 - install.upgrade:
     all:
-        branch: next
--- a/suites/upgrade-small/rados/5-next-workload/next.yaml
+++ b/suites/upgrade-small/rados/5-next-workload/next.yaml
@ -1,6 +1,5 @@
 tasks:
 - workunit:
-    branch: next
    clients:
      client.0:
        - rados/test.sh
--- a/suites/upgrade-small/rbd/3-upgrade-sequence/upgrade-all.yaml
+++ b/suites/upgrade-small/rbd/3-upgrade-sequence/upgrade-all.yaml
@ -1,4 +1,3 @@
 tasks:
 - install.upgrade:
     all:
-        branch: next
--- a/suites/upgrade-small/rbd/5-next-workload/final.yaml
+++ b/suites/upgrade-small/rbd/5-next-workload/final.yaml
@ -1,6 +1,5 @@
 tasks:
 - workunit:
-     branch: next
     clients:
        client.0:
           - cls/test_cls_rbd.sh
--- a/suites/upgrade-small/rgw/3-upgrade-sequence/upgrade-all.yaml
+++ b/suites/upgrade-small/rgw/3-upgrade-sequence/upgrade-all.yaml
@ -1,4 +1,3 @@
 tasks:
 - install.upgrade:
     all:
-        branch: next
--- a/suites/upgrade/rados-double/6-upgrade-next/next.yaml
+++ b/suites/upgrade/rados-double/6-upgrade-next/next.yaml
@ -1,4 +1,3 @@
 tasks:
 - install.upgrade:
     all:
-        branch: next
--- a/suites/upgrade/rados-double/8-next-workload/api.yaml
+++ b/suites/upgrade/rados-double/8-next-workload/api.yaml
@ -1,6 +1,5 @@
 tasks:
 - workunit:
-    branch: next
    clients:
      client.0:
        - rados/test.sh
--- a/suites/upgrade/rbd-double/6-upgrade-next/next.yaml
+++ b/suites/upgrade/rbd-double/6-upgrade-next/next.yaml
@ -1,4 +1,3 @@
 tasks:
 - install.upgrade:
     all:
-        branch: next
--- a/suites/upgrade/rbd-double/8-next-workload/import-export.yaml
+++ b/suites/upgrade/rbd-double/8-next-workload/import-export.yaml
@ -1,6 +1,5 @@
 tasks:
 - workunit:
-     branch: next
     clients:
        client.0:
           - rbd/import_export.sh
--- a/suites/upgrade/rbd-double/8-next-workload/python.yaml
+++ b/suites/upgrade/rbd-double/8-next-workload/python.yaml
@ -1,6 +1,5 @@
 tasks:
 - workunit:
-     branch: next
     clients:
        client.0:
           - rbd/test_librbd_python.sh
--- a/suites/upgrade/rgw-double/6-upgrade-next/next.yaml
+++ b/suites/upgrade/rgw-double/6-upgrade-next/next.yaml
@ -1,4 +1,3 @@
 tasks:
 - install.upgrade:
     all:
-        branch: next
--- a/suites/upgrade/rgw-double/8-next-workload/s3tests.yaml
+++ b/suites/upgrade/rgw-double/8-next-workload/s3tests.yaml
@ -1,5 +1,4 @@
 tasks:
 - s3tests:
    client.0:
-      force-branch: next
      rgw_server: client.0
--- a/suites/upgrade/singleton/all/upgrade-dumpling-next.yaml
+++ b/suites/upgrade/singleton/all/upgrade-dumpling-next.yaml
@ -21,11 +21,9 @@ tasks:
        debug client: 20
 - install.upgrade:
     all:
-        branch: next
 - ceph.restart:
 - ceph-fuse: [client.0]
 - workunit:
-     branch: next
     clients:
        client.0:
           - suites/dbench.sh