upgrade: restructure rbd tests

- expand matrix
- include branch: bobtail in first set of tests so that we run the right
  version of the test

diff --git a/suites/upgrade/rbd/a/start.yaml b/suites/upgrade/rbd/a/start.yaml
new file mode 100644 (file)
index 0000000..cd071f9
--- /dev/null
+++ b/suites/upgrade/rbd/a/start.yaml
@@ -0,0 +1,14 @@
+roles:
+- - mon.a
+  - mds.a
+  - osd.0
+  - osd.1
+- - mon.b
+  - mon.c
+  - osd.2
+  - osd.3
+- - client.0
+tasks:
+- install:
+     branch: bobtail
+- ceph:

diff --git a/suites/upgrade/rbd/b/import_export.yaml b/suites/upgrade/rbd/b/import_export.yaml
new file mode 100644 (file)
index 0000000..9123db8
--- /dev/null
+++ b/suites/upgrade/rbd/b/import_export.yaml
@@ -0,0 +1,8 @@
+tasks:
+- workunit:
+     branch: bobtail
+     clients:
+        client.0:
+           - rbd/import_export.sh
+     env:
+        RBD_CREATE_ARGS: --new-format

diff --git a/suites/upgrade/rbd/b/python.yaml b/suites/upgrade/rbd/b/python.yaml
new file mode 100644 (file)
index 0000000..0390565
--- /dev/null
+++ b/suites/upgrade/rbd/b/python.yaml
@@ -0,0 +1,6 @@
+tasks:
+- workunit:
+     branch: bobtail
+     clients:
+        client.0:
+           - rbd/test_librbd_python.sh

diff --git a/suites/upgrade/rbd/c/upgrade.yaml b/suites/upgrade/rbd/c/upgrade.yaml
new file mode 100644 (file)
index 0000000..3e8e04c
--- /dev/null
+++ b/suites/upgrade/rbd/c/upgrade.yaml
@@ -0,0 +1,4 @@
+tasks:
+- install.upgrade:
+     all:
+        branch: next

diff --git a/suites/upgrade/rbd/d/mon-osd-mds.yaml b/suites/upgrade/rbd/d/mon-osd-mds.yaml
new file mode 100644 (file)
index 0000000..31a79e4
--- /dev/null
+++ b/suites/upgrade/rbd/d/mon-osd-mds.yaml
@@ -0,0 +1,2 @@
+tasks:
+- ceph.restart: [mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3, mds.a]

diff --git a/suites/upgrade/rbd/d/osd-mon-mds.yaml b/suites/upgrade/rbd/d/osd-mon-mds.yaml
new file mode 100644 (file)
index 0000000..e8fe288
--- /dev/null
+++ b/suites/upgrade/rbd/d/osd-mon-mds.yaml
@@ -0,0 +1,2 @@
+tasks:
+- ceph.restart: [osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c, mds.a]

diff --git a/suites/upgrade/rbd/e/api.yaml b/suites/upgrade/rbd/e/api.yaml
new file mode 100644 (file)
index 0000000..1ecaee4
--- /dev/null
+++ b/suites/upgrade/rbd/e/api.yaml
@@ -0,0 +1,5 @@
+tasks:
+- workunit:
+     clients:
+        client.0:
+           - rbd/test_librbd.sh

diff --git a/suites/upgrade/rbd/e/cls.yaml b/suites/upgrade/rbd/e/cls.yaml
new file mode 100644 (file)
index 0000000..9d62a69
--- /dev/null
+++ b/suites/upgrade/rbd/e/cls.yaml
@@ -0,0 +1,5 @@
+tasks:
+- workunit:
+     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
new file mode 100644 (file)
index 0000000..ae44a87
--- /dev/null
+++ b/suites/upgrade/rbd/e/import-export.yaml
@@ -0,0 +1,7 @@
+tasks:
+- workunit:
+     clients:
+        client.0:
+           - rbd/import_export.sh
+     env:
+        RBD_CREATE_ARGS: --new-format

diff --git a/suites/upgrade/rbd/e/python.yaml b/suites/upgrade/rbd/e/python.yaml
new file mode 100644 (file)
index 0000000..5c6df6e
--- /dev/null
+++ b/suites/upgrade/rbd/e/python.yaml
@@ -0,0 +1,5 @@
+tasks:
+- workunit:
+     clients:
+        client.0:
+           - rbd/test_librbd_python.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
deleted file mode 100644 (file)
index 0acfab5..0000000
--- a/suites/upgrade/rbd/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: next
-- 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
deleted file mode 100644 (file)
index 7fae144..0000000
--- a/suites/upgrade/rbd/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: next
-- 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
deleted file mode 100644 (file)
index 7489640..0000000
--- a/suites/upgrade/rbd/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: next
-- 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
deleted file mode 100644 (file)
index 93f5121..0000000
--- a/suites/upgrade/rbd/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: next
-- 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
deleted file mode 100644 (file)
index 5d9bf5e..0000000
--- a/suites/upgrade/rbd/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: next
-- 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
deleted file mode 100644 (file)
index 529f2ff..0000000
--- a/suites/upgrade/rbd/tasks/upgrade_osd_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: next
-- 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