changed "master" to "next"

Signed-off-by: tamil <tamil.muthamizhan@inktank.com>

diff --git a/suites/upgrade/basic/tasks/upgrade_mds_mon_osd.yaml b/suites/upgrade/basic/tasks/upgrade_mds_mon_osd.yaml
index 06a6235c6eb52c4ff2ece19f216d55e6f67469c8..ec57809d3b89ae4ee6a5dc700bba1b00afaf6648 100644 (file)
--- 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 9e14db0676a724062b52ef26faedf800b90f79ca..0e4bc877e1b4f88d12912084e7fdf2a33d549dd3 100644 (file)
--- 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 cb1599454378e6a6d93c93637284b41e04cba1be..6c34c1ad72a35642aaa33c2c1d8dcd1f7e250886 100644 (file)
--- 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 29613aeeb9e360a667fe2a2157c4cf706f2de25a..7a0c55f26f3f1669986f91991afa1702a2c2cc72 100644 (file)
--- 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 6afcdb9420ba9cabe6ec46c9dda6f34c5802d11b..99c1f9c1734a47d5f238123de9d53597411045aa 100644 (file)
--- 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 ee66a746e25505bf239294439d1be9c1d87e1402..4b78d3bd2c55b099a1106aaa5544c1e2af502526 100644 (file)
--- 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 98c1411960ddca188e27d9d2c3f34e344306e6d5..7de3084123dc083856dda85a2e500e4483bc1e11 100644 (file)
--- 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 312c399f50107e1130b31df6334fbf08876b4a99..619e270daadda73d4791c4ccfcc0d08f9f7080be 100644 (file)
--- 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 f5f089b6ed9fffca4b5c476cb9dad901e49f06fd..1a145260d27f5ff7d6c490134406988362feac17 100644 (file)
--- 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 9d727867b97945285ad6dc0973e530465eb94141..cd1af52229d1a8a7fd133b7852e9a9910e034938 100644 (file)
--- 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 e5862d522ce8779570f0bdad3ed0b99c117961d6..c4b291952475c7f35ca61b3b9d6fd321b851d4a1 100644 (file)
--- 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 80aeb00a3fddbb5c698937dfead21c69f3b035b2..acbf83d62bd9ff4cb008cd83ab450a7b1fa79c63 100644 (file)
--- 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 528339c7ce3bd013008f27cf95bfd51089150fb9..dd8c01c046f20d6e308b9335e23f073b550b98b7 100644 (file)
--- 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 312d406cd7b7abada977b24e5b94c3aea0c806f1..5ae2c706e9125b5fe142960be6309827f98088e6 100644 (file)
--- 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 262b90d6e015e5a76261f0088fd95c44a03ea8f7..27dc5859106524e97bd583ed38ffef7d0dde07d6 100644 (file)
--- 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 d81be592cde4a8ce0109bcdda473744d6e33ccf5..d56ccd5ce8d8081ec3d1e6cecfd07a97c253416e 100644 (file)
--- 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 f16b5b88236442907309acbcbe1584b3d2939c31..7528e08e3a60e6bd5933cca6b3c1dbb28613a9db 100644 (file)
--- 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 f3f23809c11d13c54b1759c079695ff5e120a23f..b17b3c6f6c6604d104c29b2a522603bc5889d060 100644 (file)
--- 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 78abdae83d87e5f8b513ee847085ece1d025d8fb..0acfab523ad769394c4c1eae41e0e7d9af0f5eb1 100644 (file)
--- 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 f3bbf76d459eec9fc2679cea74ca9c0c1829770c..7fae1444c3764b552342551a50ac1abcffe64f4b 100644 (file)
--- 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 bcaad3f34e0943bff0bb6aeab12fd79f7fa74fb4..7489640be069ddc69a187556f70eeb0b4b324efb 100644 (file)
--- 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 4ef24a46faf4b85601a18c79454dbcd15da42d60..93f5121d6d031eb8ab54cf81607c25f3d3fdfe9d 100644 (file)
--- 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 1faa66faa345893ad233fbb9ffb2db5568764ba2..5d9bf5ef44a0712af87995619fa7a108a3457137 100644 (file)
--- 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 382409d8ea8ba2904c015414f5eb8d2699763c99..529f2ffab989c9cb241ffc72e5bae1512899072b 100644 (file)
--- 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 ebc0d74bf3ae10c1959caa5b58611c4249bfb6d2..7caaf12954e28f7c17107eeab0272af04c904e6e 100644 (file)
--- 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 ebc0d74bf3ae10c1959caa5b58611c4249bfb6d2..7caaf12954e28f7c17107eeab0272af04c904e6e 100644 (file)
--- 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: