task yaml for upgrade task

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

diff --git a/suites/upgrade/fs/basic/tasks/upgrade_mds_first_blogbench_fsstress.yaml b/suites/upgrade/fs/basic/tasks/upgrade_mds_first_blogbench_fsstress.yaml
deleted file mode 100644 (file)
index 98c1411..0000000
--- a/suites/upgrade/fs/basic/tasks/upgrade_mds_first_blogbench_fsstress.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-- - mon.b
-  - mon.c
-  - osd.2
-  - osd.3
-- - client.0
-tasks:
-- install:
-     branch: bobtail
-- ceph:
-- workunit:
-     clients:
-        client.0:
-           - suites/blogbench.sh
-- install.upgrade:
-     all:
-        branch: master
-- ceph.restart: [mds.a, mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3]
-- workunit:
-     clients:
-        client.0:
-           - suites/fsstress.sh

diff --git a/suites/upgrade/fs/basic/tasks/upgrade_mds_first_fsx_ffsb.sh b/suites/upgrade/fs/basic/tasks/upgrade_mds_first_fsx_ffsb.sh
deleted file mode 100644 (file)
index 312c399..0000000
--- a/suites/upgrade/fs/basic/tasks/upgrade_mds_first_fsx_ffsb.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-- - mon.b
-  - mon.c
-  - osd.2
-  - osd.3
-- - client.0
-tasks:
-- install:
-     branch: bobtail
-- ceph:
-- workunit:
-     clients:
-        all:
-           - suites/fsx.sh
-- install.upgrade:
-     all:
-        branch: master
-- ceph.restart: [mds.a, osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c]
-- workunit:
-     clients:
-        all:
-           - suites/ffsb.sh

diff --git a/suites/upgrade/fs/basic/tasks/upgrade_mon_first_dbench_untar.yaml b/suites/upgrade/fs/basic/tasks/upgrade_mon_first_dbench_untar.yaml
deleted file mode 100644 (file)
index f5f089b..0000000
--- a/suites/upgrade/fs/basic/tasks/upgrade_mon_first_dbench_untar.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-- - mon.b
-  - mon.c
-  - osd.2
-  - osd.3
-- - client.0
-tasks:
-- install:
-     branch: bobtail
-- ceph:
-- workunit:
-     clients:
-        all:
-           - suites/dbench.sh
-- install.upgrade:
-     all:
-        branch: master
-- ceph.restart: [mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3, mds.a]
-- workunit:
-     clients:
-        all:
-           - kernel_untar_build.sh

diff --git a/suites/upgrade/fs/basic/tasks/upgrade_mon_first_iogen_trivialsync.yaml b/suites/upgrade/fs/basic/tasks/upgrade_mon_first_iogen_trivialsync.yaml
deleted file mode 100644 (file)
index 9d72786..0000000
--- a/suites/upgrade/fs/basic/tasks/upgrade_mon_first_iogen_trivialsync.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-- - mon.b
-  - mon.c
-  - osd.2
-  - osd.3
-- - client.0
-tasks:
-- install:
-     branch: bobtail
-- ceph:
-- workunit:
-     clients:
-        client.0:
-           - suites/iogen.sh
-- install.upgrade:
-     all:
-        branch: master
-- ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3]
-- workunit:
-     clients:
-        all: [misc/trivial_sync.sh]

diff --git a/suites/upgrade/fs/basic/tasks/upgrade_osd_first_dbench_tiobench.yaml b/suites/upgrade/fs/basic/tasks/upgrade_osd_first_dbench_tiobench.yaml
deleted file mode 100644 (file)
index e5862d5..0000000
--- a/suites/upgrade/fs/basic/tasks/upgrade_osd_first_dbench_tiobench.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-- - mon.b
-  - mon.c
-  - osd.2
-  - osd.3
-- - client.0
-tasks:
-- install:
-     branch: bobtail
-- ceph:
-- workunit:
-     clients:
-        all:
-           - suites/dbench.sh
-- install.upgrade:
-     all:
-        branch: master
-- ceph.restart: [osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c, mds.a]
-- workunit:
-     clients:
-        all:
-           - suites/tiobench.sh

diff --git a/suites/upgrade/fs/basic/tasks/upgrade_osd_first_iozone_iogen.yaml b/suites/upgrade/fs/basic/tasks/upgrade_osd_first_iozone_iogen.yaml
deleted file mode 100644 (file)
index 80aeb00..0000000
--- a/suites/upgrade/fs/basic/tasks/upgrade_osd_first_iozone_iogen.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-- - mon.b
-  - mon.c
-  - osd.2
-  - osd.3
-- - client.0
-tasks:
-- install:
-     branch: bobtail
-- ceph:
-- workunit:
-     clients:
-        all:
-           - suites/iozone.sh
-- install.upgrade:
-     all:
-        branch: master
-- ceph.restart: [osd.0, osd.1, osd.2, osd.3, mds.a, mon.a, mon.b, mon.c]
-- workunit:
-     clients:
-        all:
-           - suites/iogen.sh

diff --git a/suites/upgrade/fs/tasks/upgrade_mds_first_blogbench_fsstress.yaml b/suites/upgrade/fs/tasks/upgrade_mds_first_blogbench_fsstress.yaml
new file mode 100644 (file)
index 0000000..98c1411
--- /dev/null
+++ b/suites/upgrade/fs/tasks/upgrade_mds_first_blogbench_fsstress.yaml
@@ -0,0 +1,26 @@
+roles:
+- - mon.a
+  - mds.a
+  - osd.0
+  - osd.1
+- - mon.b
+  - mon.c
+  - osd.2
+  - osd.3
+- - client.0
+tasks:
+- install:
+     branch: bobtail
+- ceph:
+- workunit:
+     clients:
+        client.0:
+           - suites/blogbench.sh
+- install.upgrade:
+     all:
+        branch: master
+- ceph.restart: [mds.a, mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3]
+- workunit:
+     clients:
+        client.0:
+           - suites/fsstress.sh

diff --git a/suites/upgrade/fs/tasks/upgrade_mds_first_fsx_ffsb.sh b/suites/upgrade/fs/tasks/upgrade_mds_first_fsx_ffsb.sh
new file mode 100644 (file)
index 0000000..312c399
--- /dev/null
+++ b/suites/upgrade/fs/tasks/upgrade_mds_first_fsx_ffsb.sh
@@ -0,0 +1,26 @@
+roles:
+- - mon.a
+  - mds.a
+  - osd.0
+  - osd.1
+- - mon.b
+  - mon.c
+  - osd.2
+  - osd.3
+- - client.0
+tasks:
+- install:
+     branch: bobtail
+- ceph:
+- workunit:
+     clients:
+        all:
+           - suites/fsx.sh
+- install.upgrade:
+     all:
+        branch: master
+- ceph.restart: [mds.a, osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c]
+- workunit:
+     clients:
+        all:
+           - suites/ffsb.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
new file mode 100644 (file)
index 0000000..f5f089b
--- /dev/null
+++ b/suites/upgrade/fs/tasks/upgrade_mon_first_dbench_untar.yaml
@@ -0,0 +1,26 @@
+roles:
+- - mon.a
+  - mds.a
+  - osd.0
+  - osd.1
+- - mon.b
+  - mon.c
+  - osd.2
+  - osd.3
+- - client.0
+tasks:
+- install:
+     branch: bobtail
+- ceph:
+- workunit:
+     clients:
+        all:
+           - suites/dbench.sh
+- install.upgrade:
+     all:
+        branch: master
+- ceph.restart: [mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3, mds.a]
+- workunit:
+     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
new file mode 100644 (file)
index 0000000..9d72786
--- /dev/null
+++ b/suites/upgrade/fs/tasks/upgrade_mon_first_iogen_trivialsync.yaml
@@ -0,0 +1,25 @@
+roles:
+- - mon.a
+  - mds.a
+  - osd.0
+  - osd.1
+- - mon.b
+  - mon.c
+  - osd.2
+  - osd.3
+- - client.0
+tasks:
+- install:
+     branch: bobtail
+- ceph:
+- workunit:
+     clients:
+        client.0:
+           - suites/iogen.sh
+- install.upgrade:
+     all:
+        branch: master
+- ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3]
+- workunit:
+     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
new file mode 100644 (file)
index 0000000..e5862d5
--- /dev/null
+++ b/suites/upgrade/fs/tasks/upgrade_osd_first_dbench_tiobench.yaml
@@ -0,0 +1,26 @@
+roles:
+- - mon.a
+  - mds.a
+  - osd.0
+  - osd.1
+- - mon.b
+  - mon.c
+  - osd.2
+  - osd.3
+- - client.0
+tasks:
+- install:
+     branch: bobtail
+- ceph:
+- workunit:
+     clients:
+        all:
+           - suites/dbench.sh
+- install.upgrade:
+     all:
+        branch: master
+- ceph.restart: [osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c, mds.a]
+- workunit:
+     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
new file mode 100644 (file)
index 0000000..80aeb00
--- /dev/null
+++ b/suites/upgrade/fs/tasks/upgrade_osd_first_iozone_iogen.yaml
@@ -0,0 +1,26 @@
+roles:
+- - mon.a
+  - mds.a
+  - osd.0
+  - osd.1
+- - mon.b
+  - mon.c
+  - osd.2
+  - osd.3
+- - client.0
+tasks:
+- install:
+     branch: bobtail
+- ceph:
+- workunit:
+     clients:
+        all:
+           - suites/iozone.sh
+- install.upgrade:
+     all:
+        branch: master
+- ceph.restart: [osd.0, osd.1, osd.2, osd.3, mds.a, mon.a, mon.b, mon.c]
+- workunit:
+     clients:
+        all:
+           - suites/iogen.sh

diff --git a/suites/upgrade/rados/basic/tasks/upgrade_mds_first_rados_api_python.sh b/suites/upgrade/rados/basic/tasks/upgrade_mds_first_rados_api_python.sh
deleted file mode 100644 (file)
index 528339c..0000000
--- a/suites/upgrade/rados/basic/tasks/upgrade_mds_first_rados_api_python.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-- - mon.b
-  - mon.c
-  - osd.2
-  - osd.3
-- - client.0
-tasks:
-- install:
-     branch: bobtail
-- ceph:
-- workunit:
-     clients:
-        client.0:
-           - rados/test.sh
-- install.upgrade:
-     all:
-        branch: master
-- ceph.restart: [mds.a, mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3]
-- workunit:
-     clients:
-        client.0:
-           - rados/test_python.sh

diff --git a/suites/upgrade/rados/basic/tasks/upgrade_mds_first_rados_loadgen_big.sh b/suites/upgrade/rados/basic/tasks/upgrade_mds_first_rados_loadgen_big.sh
deleted file mode 100644 (file)
index 312d406..0000000
--- a/suites/upgrade/rados/basic/tasks/upgrade_mds_first_rados_loadgen_big.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-- - mon.b
-  - mon.c
-  - osd.2
-  - osd.3
-- - client.0
-tasks:
-- install:
-     branch: bobtail
-- ceph:
-- workunit:
-     clients:
-        client.0:
-           - rados/load-gen-big.sh
-- install.upgrade:
-     all:
-        branch: master
-- ceph.restart: [mds.a, osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c]
-- workunit:
-     clients:
-        client.0:
-           - rados/load-gen-big.sh

diff --git a/suites/upgrade/rados/basic/tasks/upgrade_mon_first_rados_api_python.sh b/suites/upgrade/rados/basic/tasks/upgrade_mon_first_rados_api_python.sh
deleted file mode 100644 (file)
index 262b90d..0000000
--- a/suites/upgrade/rados/basic/tasks/upgrade_mon_first_rados_api_python.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-- - mon.b
-  - mon.c
-  - osd.2
-  - osd.3
-- - client.0
-tasks:
-- install:
-     branch: bobtail
-- ceph:
-- workunit:
-     clients:
-        client.0:
-           - rados/test_python.sh
-- install.upgrade:
-     all:
-        branch: master
-- ceph.restart: [mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3, mds.a]
-- workunit:
-     clients:
-        client.0:
-           - rados/test.sh

diff --git a/suites/upgrade/rados/basic/tasks/upgrade_mon_first_rados_loadgen_big.sh b/suites/upgrade/rados/basic/tasks/upgrade_mon_first_rados_loadgen_big.sh
deleted file mode 100644 (file)
index d81be59..0000000
--- a/suites/upgrade/rados/basic/tasks/upgrade_mon_first_rados_loadgen_big.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-- - mon.b
-  - mon.c
-  - osd.2
-  - osd.3
-- - client.0
-tasks:
-- install:
-     branch: bobtail
-- ceph:
-- workunit:
-     clients:
-        client.0:
-           - rados/load-gen-big.sh
-- install.upgrade:
-     all:
-        branch: master
-- ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3]
-- workunit:
-     clients:
-        client.0:
-           - rados/load-gen-big.sh

diff --git a/suites/upgrade/rados/basic/tasks/upgrade_osd_first_rados_api_python.sh b/suites/upgrade/rados/basic/tasks/upgrade_osd_first_rados_api_python.sh
deleted file mode 100644 (file)
index f16b5b8..0000000
--- a/suites/upgrade/rados/basic/tasks/upgrade_osd_first_rados_api_python.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-- - mon.b
-  - mon.c
-  - osd.2
-  - osd.3
-- - client.0
-tasks:
-- install:
-     branch: bobtail
-- ceph:
-- workunit:
-     clients:
-        client.0:
-           - rados/test.sh
-- install.upgrade:
-     all:
-        branch: master
-- ceph.restart: [osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c, mds.a]
-- workunit:
-     clients:
-        client.0:
-           - rados/test_python.sh

diff --git a/suites/upgrade/rados/basic/tasks/upgrade_osd_first_rados_loadgen_big.sh b/suites/upgrade/rados/basic/tasks/upgrade_osd_first_rados_loadgen_big.sh
deleted file mode 100644 (file)
index f3f2380..0000000
--- a/suites/upgrade/rados/basic/tasks/upgrade_osd_first_rados_loadgen_big.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-- - mon.b
-  - mon.c
-  - osd.2
-  - osd.3
-- - client.0
-tasks:
-- install:
-     branch: bobtail
-- ceph:
-- workunit:
-     clients:
-        client.0:
-           - rados/load-gen-big.sh
-- install.upgrade:
-     all:
-        branch: master
-- ceph.restart: [osd.0, osd.1, osd.2, osd.3, mds.a, mon.a, mon.b, mon.c]
-- workunit:
-     clients:
-        client.0:
-           - rados/load-gen-big.sh

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
new file mode 100644 (file)
index 0000000..528339c
--- /dev/null
+++ b/suites/upgrade/rados/tasks/upgrade_mds_first_rados_api_python.yaml
@@ -0,0 +1,26 @@
+roles:
+- - mon.a
+  - mds.a
+  - osd.0
+  - osd.1
+- - mon.b
+  - mon.c
+  - osd.2
+  - osd.3
+- - client.0
+tasks:
+- install:
+     branch: bobtail
+- ceph:
+- workunit:
+     clients:
+        client.0:
+           - rados/test.sh
+- install.upgrade:
+     all:
+        branch: master
+- ceph.restart: [mds.a, mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3]
+- workunit:
+     clients:
+        client.0:
+           - rados/test_python.sh

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
new file mode 100644 (file)
index 0000000..312d406
--- /dev/null
+++ b/suites/upgrade/rados/tasks/upgrade_mds_first_rados_loadgen_big.yaml
@@ -0,0 +1,26 @@
+roles:
+- - mon.a
+  - mds.a
+  - osd.0
+  - osd.1
+- - mon.b
+  - mon.c
+  - osd.2
+  - osd.3
+- - client.0
+tasks:
+- install:
+     branch: bobtail
+- ceph:
+- workunit:
+     clients:
+        client.0:
+           - rados/load-gen-big.sh
+- install.upgrade:
+     all:
+        branch: master
+- ceph.restart: [mds.a, osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c]
+- workunit:
+     clients:
+        client.0:
+           - rados/load-gen-big.sh

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
new file mode 100644 (file)
index 0000000..262b90d
--- /dev/null
+++ b/suites/upgrade/rados/tasks/upgrade_mon_first_rados_api_python.yaml
@@ -0,0 +1,26 @@
+roles:
+- - mon.a
+  - mds.a
+  - osd.0
+  - osd.1
+- - mon.b
+  - mon.c
+  - osd.2
+  - osd.3
+- - client.0
+tasks:
+- install:
+     branch: bobtail
+- ceph:
+- workunit:
+     clients:
+        client.0:
+           - rados/test_python.sh
+- install.upgrade:
+     all:
+        branch: master
+- ceph.restart: [mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3, mds.a]
+- workunit:
+     clients:
+        client.0:
+           - rados/test.sh

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
new file mode 100644 (file)
index 0000000..d81be59
--- /dev/null
+++ b/suites/upgrade/rados/tasks/upgrade_mon_first_rados_loadgen_big.yaml
@@ -0,0 +1,26 @@
+roles:
+- - mon.a
+  - mds.a
+  - osd.0
+  - osd.1
+- - mon.b
+  - mon.c
+  - osd.2
+  - osd.3
+- - client.0
+tasks:
+- install:
+     branch: bobtail
+- ceph:
+- workunit:
+     clients:
+        client.0:
+           - rados/load-gen-big.sh
+- install.upgrade:
+     all:
+        branch: master
+- ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3]
+- workunit:
+     clients:
+        client.0:
+           - rados/load-gen-big.sh

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
new file mode 100644 (file)
index 0000000..f16b5b8
--- /dev/null
+++ b/suites/upgrade/rados/tasks/upgrade_osd_first_rados_api_python.yaml
@@ -0,0 +1,26 @@
+roles:
+- - mon.a
+  - mds.a
+  - osd.0
+  - osd.1
+- - mon.b
+  - mon.c
+  - osd.2
+  - osd.3
+- - client.0
+tasks:
+- install:
+     branch: bobtail
+- ceph:
+- workunit:
+     clients:
+        client.0:
+           - rados/test.sh
+- install.upgrade:
+     all:
+        branch: master
+- ceph.restart: [osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c, mds.a]
+- workunit:
+     clients:
+        client.0:
+           - rados/test_python.sh

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
new file mode 100644 (file)
index 0000000..f3f2380
--- /dev/null
+++ b/suites/upgrade/rados/tasks/upgrade_osd_first_rados_loadgen_big.yaml
@@ -0,0 +1,26 @@
+roles:
+- - mon.a
+  - mds.a
+  - osd.0
+  - osd.1
+- - mon.b
+  - mon.c
+  - osd.2
+  - osd.3
+- - client.0
+tasks:
+- install:
+     branch: bobtail
+- ceph:
+- workunit:
+     clients:
+        client.0:
+           - rados/load-gen-big.sh
+- install.upgrade:
+     all:
+        branch: master
+- ceph.restart: [osd.0, osd.1, osd.2, osd.3, mds.a, mon.a, mon.b, mon.c]
+- workunit:
+     clients:
+        client.0:
+           - rados/load-gen-big.sh

diff --git a/suites/upgrade/rbd/basic/tasks/upgrade_mds_first_rbd_import_export.yaml b/suites/upgrade/rbd/basic/tasks/upgrade_mds_first_rbd_import_export.yaml
deleted file mode 100644 (file)
index 78abdae..0000000
--- a/suites/upgrade/rbd/basic/tasks/upgrade_mds_first_rbd_import_export.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-- - mon.b
-  - mon.c
-  - osd.2
-  - osd.3
-- - client.0
-tasks:
-- install:
-     branch: bobtail
-- ceph:
-- workunit:
-     clients:
-        client.0:
-           - rbd/import_export.sh
-     env:
-        RBD_CREATE_ARGS: --new-format
-- install.upgrade:
-     all:
-        branch: master
-- ceph.restart: [mds.a, osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c]
-- workunit:
-     clients:
-        client.0:
-           - rbd/import_export.sh
-     env:
-        RBD_CREATE_ARGS: --new-format

diff --git a/suites/upgrade/rbd/basic/tasks/upgrade_mds_first_test_cls_librbd.yaml b/suites/upgrade/rbd/basic/tasks/upgrade_mds_first_test_cls_librbd.yaml
deleted file mode 100644 (file)
index f3bbf76..0000000
--- a/suites/upgrade/rbd/basic/tasks/upgrade_mds_first_test_cls_librbd.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-- - mon.b
-  - mon.c
-  - osd.2
-  - osd.3
-- - client.0
-tasks:
-- install:
-     branch: bobtail
-- ceph:
-- workunit:
-     clients:
-        client.0:
-           - cls/test_cls_rbd.sh
-- install.upgrade:
-     all:
-        branch: master
-- ceph.restart: [mds.a, mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3]
-- workunit:
-     clients:
-        client.0:
-           - rbd/test_librbd.sh 

diff --git a/suites/upgrade/rbd/basic/tasks/upgrade_mon_first_rbd_api_tests.yaml b/suites/upgrade/rbd/basic/tasks/upgrade_mon_first_rbd_api_tests.yaml
deleted file mode 100644 (file)
index bcaad3f..0000000
--- a/suites/upgrade/rbd/basic/tasks/upgrade_mon_first_rbd_api_tests.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-- - mon.b
-  - mon.c
-  - osd.2
-  - osd.3
-- - client.0
-tasks:
-- install:
-     branch: bobtail
-- ceph:
-- workunit:
-     clients:
-        client.0:
-           - rbd/run_cli_tests.sh
-- install.upgrade:
-     all:
-        branch: master
-- ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3]
-- workunit:
-     clients:
-        client.0:
-           - rbd/test_librbd.sh

diff --git a/suites/upgrade/rbd/basic/tasks/upgrade_mon_first_rbd_python_api_tests.yaml b/suites/upgrade/rbd/basic/tasks/upgrade_mon_first_rbd_python_api_tests.yaml
deleted file mode 100644 (file)
index 4ef24a4..0000000
--- a/suites/upgrade/rbd/basic/tasks/upgrade_mon_first_rbd_python_api_tests.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-- - mon.b
-  - mon.c
-  - osd.2
-  - osd.3
-- - client.0
-tasks:
-- install:
-     branch: bobtail
-- ceph:
-- workunit:
-     clients:
-        client.0:
-           - rbd/test_librbd_python.sh
-- install.upgrade:
-     all:
-        branch: master
-- ceph.restart: [mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3, mds.a]
-- workunit:
-     clients:
-        client.0:
-           - rbd/test_librbd.sh

diff --git a/suites/upgrade/rbd/basic/tasks/upgrade_osd_first_rbd_python_api_tests.yaml b/suites/upgrade/rbd/basic/tasks/upgrade_osd_first_rbd_python_api_tests.yaml
deleted file mode 100644 (file)
index 1faa66f..0000000
--- a/suites/upgrade/rbd/basic/tasks/upgrade_osd_first_rbd_python_api_tests.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-- - mon.b
-  - mon.c
-  - osd.2
-  - osd.3
-- - client.0
-tasks:
-- install:
-     branch: bobtail
-- ceph:
-- workunit:
-     clients:
-        client.0:
-           - rbd/test_librbd_python.sh
-- install.upgrade:
-     all:
-        branch: master
-- ceph.restart: [osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c, mds.a]
-- workunit:
-     clients:
-        client.0:
-           - rbd/test_librbd_python.sh

diff --git a/suites/upgrade/rbd/basic/tasks/upgrade_osd_first_test_cls_librbd.sh b/suites/upgrade/rbd/basic/tasks/upgrade_osd_first_test_cls_librbd.sh
deleted file mode 100644 (file)
index 382409d..0000000
--- a/suites/upgrade/rbd/basic/tasks/upgrade_osd_first_test_cls_librbd.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-- - mon.b
-  - mon.c
-  - osd.2
-  - osd.3
-- - client.0
-tasks:
-- install:
-     branch: bobtail
-- ceph:
-- workunit:
-     clients:
-        client.0:
-           - cls/test_cls_rbd.sh
-- install.upgrade:
-     all:
-        branch: master
-- ceph.restart: [osd.0, osd.1, osd.2, osd.3, mds.a, mon.a, mon.b, mon.c]
-- workunit:
-     clients:
-        client.0:
-           - rbd/test_librbd.sh 

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
new file mode 100644 (file)
index 0000000..78abdae
--- /dev/null
+++ b/suites/upgrade/rbd/tasks/upgrade_mds_first_rbd_import_export.yaml
@@ -0,0 +1,30 @@
+roles:
+- - mon.a
+  - mds.a
+  - osd.0
+  - osd.1
+- - mon.b
+  - mon.c
+  - osd.2
+  - osd.3
+- - client.0
+tasks:
+- install:
+     branch: bobtail
+- ceph:
+- workunit:
+     clients:
+        client.0:
+           - rbd/import_export.sh
+     env:
+        RBD_CREATE_ARGS: --new-format
+- install.upgrade:
+     all:
+        branch: master
+- ceph.restart: [mds.a, osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c]
+- workunit:
+     clients:
+        client.0:
+           - rbd/import_export.sh
+     env:
+        RBD_CREATE_ARGS: --new-format

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
new file mode 100644 (file)
index 0000000..f3bbf76
--- /dev/null
+++ b/suites/upgrade/rbd/tasks/upgrade_mds_first_test_cls_librbd.yaml
@@ -0,0 +1,26 @@
+roles:
+- - mon.a
+  - mds.a
+  - osd.0
+  - osd.1
+- - mon.b
+  - mon.c
+  - osd.2
+  - osd.3
+- - client.0
+tasks:
+- install:
+     branch: bobtail
+- ceph:
+- workunit:
+     clients:
+        client.0:
+           - cls/test_cls_rbd.sh
+- install.upgrade:
+     all:
+        branch: master
+- ceph.restart: [mds.a, mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3]
+- workunit:
+     clients:
+        client.0:
+           - rbd/test_librbd.sh 

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
new file mode 100644 (file)
index 0000000..bcaad3f
--- /dev/null
+++ b/suites/upgrade/rbd/tasks/upgrade_mon_first_rbd_api_tests.yaml
@@ -0,0 +1,26 @@
+roles:
+- - mon.a
+  - mds.a
+  - osd.0
+  - osd.1
+- - mon.b
+  - mon.c
+  - osd.2
+  - osd.3
+- - client.0
+tasks:
+- install:
+     branch: bobtail
+- ceph:
+- workunit:
+     clients:
+        client.0:
+           - rbd/run_cli_tests.sh
+- install.upgrade:
+     all:
+        branch: master
+- ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3]
+- workunit:
+     clients:
+        client.0:
+           - rbd/test_librbd.sh

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
new file mode 100644 (file)
index 0000000..4ef24a4
--- /dev/null
+++ b/suites/upgrade/rbd/tasks/upgrade_mon_first_rbd_python_api_tests.yaml
@@ -0,0 +1,26 @@
+roles:
+- - mon.a
+  - mds.a
+  - osd.0
+  - osd.1
+- - mon.b
+  - mon.c
+  - osd.2
+  - osd.3
+- - client.0
+tasks:
+- install:
+     branch: bobtail
+- ceph:
+- workunit:
+     clients:
+        client.0:
+           - rbd/test_librbd_python.sh
+- install.upgrade:
+     all:
+        branch: master
+- ceph.restart: [mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3, mds.a]
+- workunit:
+     clients:
+        client.0:
+           - rbd/test_librbd.sh

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
new file mode 100644 (file)
index 0000000..1faa66f
--- /dev/null
+++ b/suites/upgrade/rbd/tasks/upgrade_osd_first_rbd_python_api_tests.yaml
@@ -0,0 +1,26 @@
+roles:
+- - mon.a
+  - mds.a
+  - osd.0
+  - osd.1
+- - mon.b
+  - mon.c
+  - osd.2
+  - osd.3
+- - client.0
+tasks:
+- install:
+     branch: bobtail
+- ceph:
+- workunit:
+     clients:
+        client.0:
+           - rbd/test_librbd_python.sh
+- install.upgrade:
+     all:
+        branch: master
+- ceph.restart: [osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c, mds.a]
+- workunit:
+     clients:
+        client.0:
+           - rbd/test_librbd_python.sh

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
new file mode 100644 (file)
index 0000000..382409d
--- /dev/null
+++ b/suites/upgrade/rbd/tasks/upgrade_osd_first_test_cls_librbd.yaml
@@ -0,0 +1,26 @@
+roles:
+- - mon.a
+  - mds.a
+  - osd.0
+  - osd.1
+- - mon.b
+  - mon.c
+  - osd.2
+  - osd.3
+- - client.0
+tasks:
+- install:
+     branch: bobtail
+- ceph:
+- workunit:
+     clients:
+        client.0:
+           - cls/test_cls_rbd.sh
+- install.upgrade:
+     all:
+        branch: master
+- ceph.restart: [osd.0, osd.1, osd.2, osd.3, mds.a, mon.a, mon.b, mon.c]
+- workunit:
+     clients:
+        client.0:
+           - rbd/test_librbd.sh 

diff --git a/suites/upgrade/rgw/tasks/upgrade_mds_first_rgw_s3tests.yaml b/suites/upgrade/rgw/tasks/upgrade_mds_first_rgw_s3tests.yaml
new file mode 100644 (file)
index 0000000..f31d368
--- /dev/null
+++ b/suites/upgrade/rgw/tasks/upgrade_mds_first_rgw_s3tests.yaml
@@ -0,0 +1,27 @@
+roles:
+- - mon.a
+  - mds.a
+  - osd.0
+  - osd.1
+- - mon.b
+  - mon.c
+  - osd.2
+  - osd.3
+- - client.0
+tasks:
+- install:
+     branch: bobtail
+- ceph:
+- rgw: [client.0]
+- s3tests:
+    client.0:
+      rgw_server: client.0
+- install.upgrade:
+     all:
+        branch: next
+- ceph.restart: [mds.a, osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c]
+- rgw: [client.0]
+- s3tests:
+    client.0:
+      rgw_server: client.0
+