upgrade: set workunit branch before and after upgrade

diff --git a/suites/upgrade/fs/tasks/upgrade_mds_first_blogbench_fsstress.yaml b/suites/upgrade/fs/tasks/upgrade_mds_first_blogbench_fsstress.yaml
index 12cdbaad161d5bbdc294f06370d5831678ca2257..8ae2bccc0a7bef2759188ec42ede77987eb885c3 100644 (file)
--- a/suites/upgrade/fs/tasks/upgrade_mds_first_blogbench_fsstress.yaml
+++ b/suites/upgrade/fs/tasks/upgrade_mds_first_blogbench_fsstress.yaml
@@ -14,6 +14,7 @@ tasks:
 - ceph:
 - ceph-fuse:
 - workunit:
+     branch: bobtail
      clients:
         client.0:
            - suites/blogbench.sh
@@ -22,6 +23,7 @@ tasks:
         branch: next
 - ceph.restart: [mds.a, mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3]
 - workunit:
+     branch: next
      clients:
         client.0:
            - suites/fsstress.sh

diff --git a/suites/upgrade/fs/tasks/upgrade_mon_first_dbench_untar.yaml b/suites/upgrade/fs/tasks/upgrade_mon_first_dbench_untar.yaml
index 6eafd7295b5e60f92f7da58ef6b8b71f6ee42465..deb9210ed2ade3fe85b8b28d61777778716161b3 100644 (file)
--- a/suites/upgrade/fs/tasks/upgrade_mon_first_dbench_untar.yaml
+++ b/suites/upgrade/fs/tasks/upgrade_mon_first_dbench_untar.yaml
@@ -16,6 +16,7 @@ tasks:
       - wrongly marked
 - ceph-fuse:
 - workunit:
+     branch: bobtail
      clients:
         all:
            - suites/dbench.sh
@@ -24,6 +25,7 @@ tasks:
         branch: next
 - ceph.restart: [mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3, mds.a]
 - workunit:
+     branch: next
      clients:
         all:
            - kernel_untar_build.sh

diff --git a/suites/upgrade/fs/tasks/upgrade_mon_first_iogen_trivialsync.yaml b/suites/upgrade/fs/tasks/upgrade_mon_first_iogen_trivialsync.yaml
index cd1af52229d1a8a7fd133b7852e9a9910e034938..326add4472ddaf09c7b6847697c25eaabb1e6c90 100644 (file)
--- a/suites/upgrade/fs/tasks/upgrade_mon_first_iogen_trivialsync.yaml
+++ b/suites/upgrade/fs/tasks/upgrade_mon_first_iogen_trivialsync.yaml
@@ -13,6 +13,7 @@ tasks:
      branch: bobtail
 - ceph:
 - workunit:
+     branch: bobtail
      clients:
         client.0:
            - suites/iogen.sh
@@ -21,5 +22,6 @@ tasks:
         branch: next
 - ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3]
 - workunit:
+     branch: next
      clients:
         all: [misc/trivial_sync.sh]

diff --git a/suites/upgrade/fs/tasks/upgrade_osd_first_dbench_tiobench.yaml b/suites/upgrade/fs/tasks/upgrade_osd_first_dbench_tiobench.yaml
index c4b291952475c7f35ca61b3b9d6fd321b851d4a1..67010bad7c0e48f23056400564a70f94c25a2bdf 100644 (file)
--- a/suites/upgrade/fs/tasks/upgrade_osd_first_dbench_tiobench.yaml
+++ b/suites/upgrade/fs/tasks/upgrade_osd_first_dbench_tiobench.yaml
@@ -13,6 +13,7 @@ tasks:
      branch: bobtail
 - ceph:
 - workunit:
+     branch: bobtail
      clients:
         all:
            - suites/dbench.sh
@@ -21,6 +22,7 @@ tasks:
         branch: next
 - ceph.restart: [osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c, mds.a]
 - workunit:
+     branch: next
      clients:
         all:
            - suites/tiobench.sh

diff --git a/suites/upgrade/fs/tasks/upgrade_osd_first_iozone_iogen.yaml b/suites/upgrade/fs/tasks/upgrade_osd_first_iozone_iogen.yaml
index d91c13196f278954a57d901f47f82bb591b7563f..8be4c5541289ff232a747f45e65f41df6f241e98 100644 (file)
--- a/suites/upgrade/fs/tasks/upgrade_osd_first_iozone_iogen.yaml
+++ b/suites/upgrade/fs/tasks/upgrade_osd_first_iozone_iogen.yaml
@@ -14,6 +14,7 @@ tasks:
 - ceph:
 - ceph-fuse:
 - workunit:
+     branch: bobtail
      clients:
         all:
            - suites/iozone.sh
@@ -22,6 +23,7 @@ tasks:
         branch: next
 - ceph.restart: [osd.0, osd.1, osd.2, osd.3, mds.a, mon.a, mon.b, mon.c]
 - workunit:
+     branch: next
      clients:
         all:
            - suites/iogen.sh

diff --git a/suites/upgrade/rados/a/start.yaml b/suites/upgrade/rados/a/start.yaml
index c23b2a95ca318bc5941c214f24580a8652c9f088..b556eb06b30ade8b52dd774ebfa3d46ded80c335 100644 (file)
--- a/suites/upgrade/rados/a/start.yaml
+++ b/suites/upgrade/rados/a/start.yaml
@@ -13,6 +13,7 @@ tasks:
      branch: bobtail
 - ceph:
 - workunit:
+     branch: bobtail
      clients:
         client.0:
            - rados/load-gen-mix.sh

diff --git a/suites/upgrade/rados/c/tail.yaml b/suites/upgrade/rados/c/tail.yaml
index ce99dbd9ed7bdd6bab5473e0e9978d353cb87934..085348dbd217964a6c8eeac583ef6c278ecf9c6b 100644 (file)
--- a/suites/upgrade/rados/c/tail.yaml
+++ b/suites/upgrade/rados/c/tail.yaml
@@ -1,5 +1,6 @@
 tasks:
 - workunit:
+     branch: next
      clients:
         client.0:
            - rados/test.sh

diff --git a/suites/upgrade/rbd/e/api.yaml b/suites/upgrade/rbd/e/api.yaml
index 1ecaee4bf78fa103b95c9631de39718ce0d7d0bf..405a4932dc173292bdb1b31ffeae7ff71df75d77 100644 (file)
--- a/suites/upgrade/rbd/e/api.yaml
+++ b/suites/upgrade/rbd/e/api.yaml
@@ -1,5 +1,6 @@
 tasks:
 - workunit:
+     branch: next
      clients:
         client.0:
            - rbd/test_librbd.sh

diff --git a/suites/upgrade/rbd/e/cls.yaml b/suites/upgrade/rbd/e/cls.yaml
index 9d62a693458247a8cda073f0415a47e1715a0a60..ee960fed0e4e525798d55211a48fe69101a9123c 100644 (file)
--- a/suites/upgrade/rbd/e/cls.yaml
+++ b/suites/upgrade/rbd/e/cls.yaml
@@ -1,5 +1,6 @@
 tasks:
 - workunit:
+     branch: next
      clients:
         client.0:
            - cls/test_cls_rbd.sh

diff --git a/suites/upgrade/rbd/e/import-export.yaml b/suites/upgrade/rbd/e/import-export.yaml
index ae44a8738298b1b21c47fd645a3ee438778e9950..c603b532648b2cef2364fd692fcf0232c198e329 100644 (file)
--- a/suites/upgrade/rbd/e/import-export.yaml
+++ b/suites/upgrade/rbd/e/import-export.yaml
@@ -1,5 +1,6 @@
 tasks:
 - workunit:
+     branch: next
      clients:
         client.0:
            - rbd/import_export.sh

diff --git a/suites/upgrade/rbd/e/python.yaml b/suites/upgrade/rbd/e/python.yaml
index 5c6df6e38dd8083b658528b8d20898118e75557a..8a98bc91fcc653435a611b20a3f5c739282aa0eb 100644 (file)
--- a/suites/upgrade/rbd/e/python.yaml
+++ b/suites/upgrade/rbd/e/python.yaml
@@ -1,5 +1,6 @@
 tasks:
 - workunit:
+     branch: next
      clients:
         client.0:
            - rbd/test_librbd_python.sh

diff --git a/suites/upgrade/singleton/all/basic-test.yaml b/suites/upgrade/singleton/all/basic-test.yaml
index cf2605b145c678189b92c2a8613daec9a634f93e..452895f06675e473643bc3d65f002fd37aebb0aa 100644 (file)
--- a/suites/upgrade/singleton/all/basic-test.yaml
+++ b/suites/upgrade/singleton/all/basic-test.yaml
@@ -25,6 +25,7 @@ tasks:
 - ceph.restart:
 - ceph-fuse: [client.0]
 - workunit:
+     branch: next
      clients:
         client.0:
            - suites/dbench.sh

diff --git a/suites/upgrade/singleton/all/basic-upgrade.yaml b/suites/upgrade/singleton/all/basic-upgrade.yaml
index 9649d6782a0c2c7afce41dd3b81adb7e1fe0bbb4..db30f00667a86524b41fe1c226dd2d59f388d239 100644 (file)
--- a/suites/upgrade/singleton/all/basic-upgrade.yaml
+++ b/suites/upgrade/singleton/all/basic-upgrade.yaml
@@ -18,6 +18,7 @@ tasks:
 - ceph.restart:
 - ceph-fuse: [client.0]
 - workunit:
+     branch: next
      clients:
         client.0:
            - suites/dbench.sh