From 7eb09ef3a65e4934ac75b2d64c33747aa3af4388 Mon Sep 17 00:00:00 2001 From: tamil Date: Mon, 8 Apr 2013 18:09:39 -0700 Subject: [PATCH] changed "master" to "next" Signed-off-by: tamil --- suites/upgrade/basic/tasks/upgrade_mds_mon_osd.yaml | 2 +- suites/upgrade/basic/tasks/upgrade_mds_osd_mon.yaml | 2 +- suites/upgrade/basic/tasks/upgrade_mon_mds_osd.yaml | 2 +- suites/upgrade/basic/tasks/upgrade_mon_osd_mds.yaml | 2 +- suites/upgrade/basic/tasks/upgrade_osd_mds_mon.yaml | 2 +- suites/upgrade/basic/tasks/upgrade_osd_mon_mds.yaml | 2 +- .../fs/tasks/upgrade_mds_first_blogbench_fsstress.yaml | 2 +- suites/upgrade/fs/tasks/upgrade_mds_first_fsx_ffsb.sh | 2 +- suites/upgrade/fs/tasks/upgrade_mon_first_dbench_untar.yaml | 2 +- .../upgrade/fs/tasks/upgrade_mon_first_iogen_trivialsync.yaml | 2 +- .../upgrade/fs/tasks/upgrade_osd_first_dbench_tiobench.yaml | 2 +- suites/upgrade/fs/tasks/upgrade_osd_first_iozone_iogen.yaml | 2 +- .../rados/tasks/upgrade_mds_first_rados_api_python.yaml | 2 +- .../rados/tasks/upgrade_mds_first_rados_loadgen_big.yaml | 2 +- .../rados/tasks/upgrade_mon_first_rados_api_python.yaml | 2 +- .../rados/tasks/upgrade_mon_first_rados_loadgen_big.yaml | 2 +- .../rados/tasks/upgrade_osd_first_rados_api_python.yaml | 2 +- .../rados/tasks/upgrade_osd_first_rados_loadgen_big.yaml | 2 +- .../rbd/tasks/upgrade_mds_first_rbd_import_export.yaml | 2 +- .../upgrade/rbd/tasks/upgrade_mds_first_test_cls_librbd.yaml | 2 +- suites/upgrade/rbd/tasks/upgrade_mon_first_rbd_api_tests.yaml | 2 +- .../rbd/tasks/upgrade_mon_first_rbd_python_api_tests.yaml | 2 +- .../rbd/tasks/upgrade_osd_first_rbd_python_api_tests.yaml | 2 +- .../upgrade/rbd/tasks/upgrade_osd_first_test_cls_librbd.yaml | 2 +- suites/upgrade/singleton/all/basic-test.yaml | 4 ++-- suites/upgrade/singleton/all/basic-upgrade.yaml | 4 ++-- 26 files changed, 28 insertions(+), 28 deletions(-) diff --git a/suites/upgrade/basic/tasks/upgrade_mds_mon_osd.yaml b/suites/upgrade/basic/tasks/upgrade_mds_mon_osd.yaml index 06a6235c6eb5..ec57809d3b89 100644 --- a/suites/upgrade/basic/tasks/upgrade_mds_mon_osd.yaml +++ b/suites/upgrade/basic/tasks/upgrade_mds_mon_osd.yaml @@ -18,7 +18,7 @@ tasks: - suites/blogbench.sh - install.upgrade: all: - branch: master + branch: next - ceph.restart: [mds.a, mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3] - workunit: clients: diff --git a/suites/upgrade/basic/tasks/upgrade_mds_osd_mon.yaml b/suites/upgrade/basic/tasks/upgrade_mds_osd_mon.yaml index 9e14db0676a7..0e4bc877e1b4 100644 --- a/suites/upgrade/basic/tasks/upgrade_mds_osd_mon.yaml +++ b/suites/upgrade/basic/tasks/upgrade_mds_osd_mon.yaml @@ -18,7 +18,7 @@ tasks: - suites/fsstress.sh - install.upgrade: all: - branch: master + branch: next - ceph.restart: [mds.a, osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c] - workunit: clients: diff --git a/suites/upgrade/basic/tasks/upgrade_mon_mds_osd.yaml b/suites/upgrade/basic/tasks/upgrade_mon_mds_osd.yaml index cb1599454378..6c34c1ad72a3 100644 --- a/suites/upgrade/basic/tasks/upgrade_mon_mds_osd.yaml +++ b/suites/upgrade/basic/tasks/upgrade_mon_mds_osd.yaml @@ -18,7 +18,7 @@ tasks: - suites/bonnie.sh - install.upgrade: all: - branch: master + branch: next - ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3] - workunit: clients: diff --git a/suites/upgrade/basic/tasks/upgrade_mon_osd_mds.yaml b/suites/upgrade/basic/tasks/upgrade_mon_osd_mds.yaml index 29613aeeb9e3..7a0c55f26f3f 100644 --- a/suites/upgrade/basic/tasks/upgrade_mon_osd_mds.yaml +++ b/suites/upgrade/basic/tasks/upgrade_mon_osd_mds.yaml @@ -18,7 +18,7 @@ tasks: - suites/blogbench.sh - install.upgrade: all: - branch: master + branch: next - ceph.restart: [mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3, mds.a] - workunit: clients: diff --git a/suites/upgrade/basic/tasks/upgrade_osd_mds_mon.yaml b/suites/upgrade/basic/tasks/upgrade_osd_mds_mon.yaml index 6afcdb9420ba..99c1f9c1734a 100644 --- a/suites/upgrade/basic/tasks/upgrade_osd_mds_mon.yaml +++ b/suites/upgrade/basic/tasks/upgrade_osd_mds_mon.yaml @@ -18,7 +18,7 @@ tasks: - suites/blogbench.sh - install.upgrade: all: - branch: master + branch: next - ceph.restart: [osd.0, osd.1, osd.2, osd.3, mds.a, mon.a, mon.b, mon.c] - workunit: clients: diff --git a/suites/upgrade/basic/tasks/upgrade_osd_mon_mds.yaml b/suites/upgrade/basic/tasks/upgrade_osd_mon_mds.yaml index ee66a746e255..4b78d3bd2c55 100644 --- a/suites/upgrade/basic/tasks/upgrade_osd_mon_mds.yaml +++ b/suites/upgrade/basic/tasks/upgrade_osd_mon_mds.yaml @@ -18,7 +18,7 @@ tasks: - suites/blogbench.sh - install.upgrade: all: - branch: master + branch: next - ceph.restart: [osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c, mds.a] - workunit: clients: 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 98c1411960dd..7de3084123dc 100644 --- a/suites/upgrade/fs/tasks/upgrade_mds_first_blogbench_fsstress.yaml +++ b/suites/upgrade/fs/tasks/upgrade_mds_first_blogbench_fsstress.yaml @@ -18,7 +18,7 @@ tasks: - suites/blogbench.sh - install.upgrade: all: - branch: master + branch: next - ceph.restart: [mds.a, mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3] - workunit: clients: diff --git a/suites/upgrade/fs/tasks/upgrade_mds_first_fsx_ffsb.sh b/suites/upgrade/fs/tasks/upgrade_mds_first_fsx_ffsb.sh index 312c399f5010..619e270daadd 100644 --- a/suites/upgrade/fs/tasks/upgrade_mds_first_fsx_ffsb.sh +++ b/suites/upgrade/fs/tasks/upgrade_mds_first_fsx_ffsb.sh @@ -18,7 +18,7 @@ tasks: - suites/fsx.sh - install.upgrade: all: - branch: master + branch: next - ceph.restart: [mds.a, osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c] - workunit: clients: 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 f5f089b6ed9f..1a145260d27f 100644 --- a/suites/upgrade/fs/tasks/upgrade_mon_first_dbench_untar.yaml +++ b/suites/upgrade/fs/tasks/upgrade_mon_first_dbench_untar.yaml @@ -18,7 +18,7 @@ tasks: - suites/dbench.sh - install.upgrade: all: - branch: master + branch: next - ceph.restart: [mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3, mds.a] - workunit: clients: 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 9d727867b979..cd1af52229d1 100644 --- a/suites/upgrade/fs/tasks/upgrade_mon_first_iogen_trivialsync.yaml +++ b/suites/upgrade/fs/tasks/upgrade_mon_first_iogen_trivialsync.yaml @@ -18,7 +18,7 @@ tasks: - suites/iogen.sh - install.upgrade: all: - branch: master + branch: next - ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3] - workunit: clients: 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 e5862d522ce8..c4b291952475 100644 --- a/suites/upgrade/fs/tasks/upgrade_osd_first_dbench_tiobench.yaml +++ b/suites/upgrade/fs/tasks/upgrade_osd_first_dbench_tiobench.yaml @@ -18,7 +18,7 @@ tasks: - suites/dbench.sh - install.upgrade: all: - branch: master + branch: next - ceph.restart: [osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c, mds.a] - workunit: clients: 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 80aeb00a3fdd..acbf83d62bd9 100644 --- a/suites/upgrade/fs/tasks/upgrade_osd_first_iozone_iogen.yaml +++ b/suites/upgrade/fs/tasks/upgrade_osd_first_iozone_iogen.yaml @@ -18,7 +18,7 @@ tasks: - suites/iozone.sh - install.upgrade: all: - branch: master + branch: next - ceph.restart: [osd.0, osd.1, osd.2, osd.3, mds.a, mon.a, mon.b, mon.c] - workunit: clients: diff --git a/suites/upgrade/rados/tasks/upgrade_mds_first_rados_api_python.yaml b/suites/upgrade/rados/tasks/upgrade_mds_first_rados_api_python.yaml index 528339c7ce3b..dd8c01c046f2 100644 --- a/suites/upgrade/rados/tasks/upgrade_mds_first_rados_api_python.yaml +++ b/suites/upgrade/rados/tasks/upgrade_mds_first_rados_api_python.yaml @@ -18,7 +18,7 @@ tasks: - rados/test.sh - install.upgrade: all: - branch: master + branch: next - ceph.restart: [mds.a, mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3] - workunit: clients: diff --git a/suites/upgrade/rados/tasks/upgrade_mds_first_rados_loadgen_big.yaml b/suites/upgrade/rados/tasks/upgrade_mds_first_rados_loadgen_big.yaml index 312d406cd7b7..5ae2c706e912 100644 --- a/suites/upgrade/rados/tasks/upgrade_mds_first_rados_loadgen_big.yaml +++ b/suites/upgrade/rados/tasks/upgrade_mds_first_rados_loadgen_big.yaml @@ -18,7 +18,7 @@ tasks: - rados/load-gen-big.sh - install.upgrade: all: - branch: master + branch: next - ceph.restart: [mds.a, osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c] - workunit: clients: diff --git a/suites/upgrade/rados/tasks/upgrade_mon_first_rados_api_python.yaml b/suites/upgrade/rados/tasks/upgrade_mon_first_rados_api_python.yaml index 262b90d6e015..27dc58591065 100644 --- a/suites/upgrade/rados/tasks/upgrade_mon_first_rados_api_python.yaml +++ b/suites/upgrade/rados/tasks/upgrade_mon_first_rados_api_python.yaml @@ -18,7 +18,7 @@ tasks: - rados/test_python.sh - install.upgrade: all: - branch: master + branch: next - ceph.restart: [mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3, mds.a] - workunit: clients: diff --git a/suites/upgrade/rados/tasks/upgrade_mon_first_rados_loadgen_big.yaml b/suites/upgrade/rados/tasks/upgrade_mon_first_rados_loadgen_big.yaml index d81be592cde4..d56ccd5ce8d8 100644 --- a/suites/upgrade/rados/tasks/upgrade_mon_first_rados_loadgen_big.yaml +++ b/suites/upgrade/rados/tasks/upgrade_mon_first_rados_loadgen_big.yaml @@ -18,7 +18,7 @@ tasks: - rados/load-gen-big.sh - install.upgrade: all: - branch: master + branch: next - ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3] - workunit: clients: diff --git a/suites/upgrade/rados/tasks/upgrade_osd_first_rados_api_python.yaml b/suites/upgrade/rados/tasks/upgrade_osd_first_rados_api_python.yaml index f16b5b882364..7528e08e3a60 100644 --- a/suites/upgrade/rados/tasks/upgrade_osd_first_rados_api_python.yaml +++ b/suites/upgrade/rados/tasks/upgrade_osd_first_rados_api_python.yaml @@ -18,7 +18,7 @@ tasks: - rados/test.sh - install.upgrade: all: - branch: master + branch: next - ceph.restart: [osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c, mds.a] - workunit: clients: diff --git a/suites/upgrade/rados/tasks/upgrade_osd_first_rados_loadgen_big.yaml b/suites/upgrade/rados/tasks/upgrade_osd_first_rados_loadgen_big.yaml index f3f23809c11d..b17b3c6f6c66 100644 --- a/suites/upgrade/rados/tasks/upgrade_osd_first_rados_loadgen_big.yaml +++ b/suites/upgrade/rados/tasks/upgrade_osd_first_rados_loadgen_big.yaml @@ -18,7 +18,7 @@ tasks: - rados/load-gen-big.sh - install.upgrade: all: - branch: master + branch: next - ceph.restart: [osd.0, osd.1, osd.2, osd.3, mds.a, mon.a, mon.b, mon.c] - workunit: clients: diff --git a/suites/upgrade/rbd/tasks/upgrade_mds_first_rbd_import_export.yaml b/suites/upgrade/rbd/tasks/upgrade_mds_first_rbd_import_export.yaml index 78abdae83d87..0acfab523ad7 100644 --- a/suites/upgrade/rbd/tasks/upgrade_mds_first_rbd_import_export.yaml +++ b/suites/upgrade/rbd/tasks/upgrade_mds_first_rbd_import_export.yaml @@ -20,7 +20,7 @@ tasks: RBD_CREATE_ARGS: --new-format - install.upgrade: all: - branch: master + branch: next - ceph.restart: [mds.a, osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c] - workunit: clients: diff --git a/suites/upgrade/rbd/tasks/upgrade_mds_first_test_cls_librbd.yaml b/suites/upgrade/rbd/tasks/upgrade_mds_first_test_cls_librbd.yaml index f3bbf76d459e..7fae1444c376 100644 --- a/suites/upgrade/rbd/tasks/upgrade_mds_first_test_cls_librbd.yaml +++ b/suites/upgrade/rbd/tasks/upgrade_mds_first_test_cls_librbd.yaml @@ -18,7 +18,7 @@ tasks: - cls/test_cls_rbd.sh - install.upgrade: all: - branch: master + branch: next - ceph.restart: [mds.a, mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3] - workunit: clients: diff --git a/suites/upgrade/rbd/tasks/upgrade_mon_first_rbd_api_tests.yaml b/suites/upgrade/rbd/tasks/upgrade_mon_first_rbd_api_tests.yaml index bcaad3f34e09..7489640be069 100644 --- a/suites/upgrade/rbd/tasks/upgrade_mon_first_rbd_api_tests.yaml +++ b/suites/upgrade/rbd/tasks/upgrade_mon_first_rbd_api_tests.yaml @@ -18,7 +18,7 @@ tasks: - rbd/run_cli_tests.sh - install.upgrade: all: - branch: master + branch: next - ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3] - workunit: clients: diff --git a/suites/upgrade/rbd/tasks/upgrade_mon_first_rbd_python_api_tests.yaml b/suites/upgrade/rbd/tasks/upgrade_mon_first_rbd_python_api_tests.yaml index 4ef24a46faf4..93f5121d6d03 100644 --- a/suites/upgrade/rbd/tasks/upgrade_mon_first_rbd_python_api_tests.yaml +++ b/suites/upgrade/rbd/tasks/upgrade_mon_first_rbd_python_api_tests.yaml @@ -18,7 +18,7 @@ tasks: - rbd/test_librbd_python.sh - install.upgrade: all: - branch: master + branch: next - ceph.restart: [mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3, mds.a] - workunit: clients: diff --git a/suites/upgrade/rbd/tasks/upgrade_osd_first_rbd_python_api_tests.yaml b/suites/upgrade/rbd/tasks/upgrade_osd_first_rbd_python_api_tests.yaml index 1faa66faa345..5d9bf5ef44a0 100644 --- a/suites/upgrade/rbd/tasks/upgrade_osd_first_rbd_python_api_tests.yaml +++ b/suites/upgrade/rbd/tasks/upgrade_osd_first_rbd_python_api_tests.yaml @@ -18,7 +18,7 @@ tasks: - rbd/test_librbd_python.sh - install.upgrade: all: - branch: master + branch: next - ceph.restart: [osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c, mds.a] - workunit: clients: diff --git a/suites/upgrade/rbd/tasks/upgrade_osd_first_test_cls_librbd.yaml b/suites/upgrade/rbd/tasks/upgrade_osd_first_test_cls_librbd.yaml index 382409d8ea8b..529f2ffab989 100644 --- a/suites/upgrade/rbd/tasks/upgrade_osd_first_test_cls_librbd.yaml +++ b/suites/upgrade/rbd/tasks/upgrade_osd_first_test_cls_librbd.yaml @@ -18,7 +18,7 @@ tasks: - cls/test_cls_rbd.sh - install.upgrade: all: - branch: master + branch: next - ceph.restart: [osd.0, osd.1, osd.2, osd.3, mds.a, mon.a, mon.b, mon.c] - workunit: clients: diff --git a/suites/upgrade/singleton/all/basic-test.yaml b/suites/upgrade/singleton/all/basic-test.yaml index ebc0d74bf3ae..7caaf12954e2 100644 --- a/suites/upgrade/singleton/all/basic-test.yaml +++ b/suites/upgrade/singleton/all/basic-test.yaml @@ -10,11 +10,11 @@ roles: tasks: - install: - tag: v0.57 + branch: bobtail - ceph: - install.upgrade: all: - tag: v0.58 + branch: next - ceph.restart: - ceph-fuse: [client.0] - workunit: diff --git a/suites/upgrade/singleton/all/basic-upgrade.yaml b/suites/upgrade/singleton/all/basic-upgrade.yaml index ebc0d74bf3ae..7caaf12954e2 100644 --- a/suites/upgrade/singleton/all/basic-upgrade.yaml +++ b/suites/upgrade/singleton/all/basic-upgrade.yaml @@ -10,11 +10,11 @@ roles: tasks: - install: - tag: v0.57 + branch: bobtail - ceph: - install.upgrade: all: - tag: v0.58 + branch: next - ceph.restart: - ceph-fuse: [client.0] - workunit: -- 2.47.3