From: Sage Weil Date: Tue, 11 Jun 2013 15:36:28 +0000 (-0700) Subject: upgrade: set workunit branch before and after upgrade X-Git-Tag: v0.94.10~27^2^2~704 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=77e7bdbb2134ccb8dfeebf178979dccc32b1cad5;p=ceph.git 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 12cdbaad161d..8ae2bccc0a7b 100644 --- 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 6eafd7295b5e..deb9210ed2ad 100644 --- 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 cd1af52229d1..326add4472dd 100644 --- 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 c4b291952475..67010bad7c0e 100644 --- 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 d91c13196f27..8be4c5541289 100644 --- 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 c23b2a95ca31..b556eb06b30a 100644 --- 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 ce99dbd9ed7b..085348dbd217 100644 --- 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 1ecaee4bf78f..405a4932dc17 100644 --- 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 9d62a6934582..ee960fed0e4e 100644 --- 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 ae44a8738298..c603b532648b 100644 --- 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 5c6df6e38dd8..8a98bc91fcc6 100644 --- 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 cf2605b145c6..452895f06675 100644 --- 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 9649d6782a0c..db30f00667a8 100644 --- 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