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>

diff --git a/suites/upgrade-parallel/fs/3-upgrade-sequence/upgrade-all.yaml b/suites/upgrade-parallel/fs/3-upgrade-sequence/upgrade-all.yaml
index 079638bce92e6bb492f465caa5058e55fb1b410b..f25b98eddca1885d58c3f539bbaa4561c8ee317e 100644 (file)
--- 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]

diff --git a/suites/upgrade-parallel/rados/3-upgrade-sequence/upgrade-all.yaml b/suites/upgrade-parallel/rados/3-upgrade-sequence/upgrade-all.yaml
index 079638bce92e6bb492f465caa5058e55fb1b410b..f25b98eddca1885d58c3f539bbaa4561c8ee317e 100644 (file)
--- 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]

diff --git 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
index e8dea7928523a5ef925df690cfc56e236c53438c..df65c74e385d592fcba29c3d51121e485cbc109f 100644 (file)
--- 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

diff --git 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
index f9688c8375b1ba47599af751a754429d275dc8e0..25eb6e48413fc75f34b1db06ae25efd93e4476be 100644 (file)
--- 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

diff --git 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
index 91e607bf807b0253ae7c93ef0593235291e29f9d..e497800d547a211cb39d68916486a356b726841e 100644 (file)
--- 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

diff --git a/suites/upgrade-parallel/rgw/3-upgrade-sequence/upgrade-all.yaml b/suites/upgrade-parallel/rgw/3-upgrade-sequence/upgrade-all.yaml
index e59c1331fc573a442e6c4968b217a94ca8bc2ea0..bd62b3a1b8e11d804c2b8e38c8f4fe9e8f1a87a8 100644 (file)
--- 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]

diff --git a/suites/upgrade-parallel/stress-split/2-partial-upgrade/firsthalf.yaml b/suites/upgrade-parallel/stress-split/2-partial-upgrade/firsthalf.yaml
index b10902d84f88f3442b31a37e6262357d56884159..68c9d44b7c34b9dad9ca06807898175515f468d9 100644 (file)
--- 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]

diff --git a/suites/upgrade-small/fs/3-upgrade-sequence/upgrade-all.yaml b/suites/upgrade-small/fs/3-upgrade-sequence/upgrade-all.yaml
index c3be96a0df6abaae87d5f7e143dd3e342d2c5cd0..37bbb0f440d4ccf6d5861e2c56c57c03f7b1c9f4 100644 (file)
--- 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 
 

diff --git a/suites/upgrade-small/rados/3-upgrade-sequence/upgrade.yaml b/suites/upgrade-small/rados/3-upgrade-sequence/upgrade.yaml
index 3e8e04cadbf05dc27e2f64b252cf5130db377b65..bb34346801c652fb8f4f82677c6c22d1a1e45b6d 100644 (file)
--- 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

diff --git a/suites/upgrade-small/rados/5-next-workload/next.yaml b/suites/upgrade-small/rados/5-next-workload/next.yaml
index 3a4e8433b3b35d4822306d54ee1f470af56747c8..cd11ae6ca0c11a128a9bfd5f022d95dd3c87185c 100644 (file)
--- 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

diff --git a/suites/upgrade-small/rbd/3-upgrade-sequence/upgrade-all.yaml b/suites/upgrade-small/rbd/3-upgrade-sequence/upgrade-all.yaml
index 3e8e04cadbf05dc27e2f64b252cf5130db377b65..bb34346801c652fb8f4f82677c6c22d1a1e45b6d 100644 (file)
--- 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

diff --git a/suites/upgrade-small/rbd/5-next-workload/final.yaml b/suites/upgrade-small/rbd/5-next-workload/final.yaml
index ee960fed0e4e525798d55211a48fe69101a9123c..9d62a693458247a8cda073f0415a47e1715a0a60 100644 (file)
--- 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

diff --git a/suites/upgrade-small/rgw/3-upgrade-sequence/upgrade-all.yaml b/suites/upgrade-small/rgw/3-upgrade-sequence/upgrade-all.yaml
index 3e8e04cadbf05dc27e2f64b252cf5130db377b65..bb34346801c652fb8f4f82677c6c22d1a1e45b6d 100644 (file)
--- 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

diff --git a/suites/upgrade/rados-double/6-upgrade-next/next.yaml b/suites/upgrade/rados-double/6-upgrade-next/next.yaml
index 3e8e04cadbf05dc27e2f64b252cf5130db377b65..bb34346801c652fb8f4f82677c6c22d1a1e45b6d 100644 (file)
--- 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

diff --git a/suites/upgrade/rados-double/8-next-workload/api.yaml b/suites/upgrade/rados-double/8-next-workload/api.yaml
index 294713cf2e490a160253d0a0aa6b3ed451921ace..9b9f1f2e675d5da6d89e137f46368f509a769b67 100644 (file)
--- 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

diff --git a/suites/upgrade/rbd-double/6-upgrade-next/next.yaml b/suites/upgrade/rbd-double/6-upgrade-next/next.yaml
index 3e8e04cadbf05dc27e2f64b252cf5130db377b65..bb34346801c652fb8f4f82677c6c22d1a1e45b6d 100644 (file)
--- 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

diff --git a/suites/upgrade/rbd-double/8-next-workload/import-export.yaml b/suites/upgrade/rbd-double/8-next-workload/import-export.yaml
index c603b532648b2cef2364fd692fcf0232c198e329..ae44a8738298b1b21c47fd645a3ee438778e9950 100644 (file)
--- 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

diff --git a/suites/upgrade/rbd-double/8-next-workload/python.yaml b/suites/upgrade/rbd-double/8-next-workload/python.yaml
index 8a98bc91fcc653435a611b20a3f5c739282aa0eb..5c6df6e38dd8083b658528b8d20898118e75557a 100644 (file)
--- 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

diff --git a/suites/upgrade/rgw-double/6-upgrade-next/next.yaml b/suites/upgrade/rgw-double/6-upgrade-next/next.yaml
index 3e8e04cadbf05dc27e2f64b252cf5130db377b65..bb34346801c652fb8f4f82677c6c22d1a1e45b6d 100644 (file)
--- 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

diff --git a/suites/upgrade/rgw-double/8-next-workload/s3tests.yaml b/suites/upgrade/rgw-double/8-next-workload/s3tests.yaml
index c9978e655836556d41d1eca9372a4d70926dae6f..573cffbc30a1d123042c47a3e92bd951b41ee37f 100644 (file)
--- 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

diff --git a/suites/upgrade/singleton/all/upgrade-dumpling-next.yaml b/suites/upgrade/singleton/all/upgrade-dumpling-next.yaml
index 4abb217ba3214e57afc3f802477f48dd4896a715..a627770b16013c5f5c6d994b25efdbce2c4e7937 100644 (file)
--- 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