upgrade: reorganize the basic/rados suite

Use facets instead of duplicating the test content each time.

diff --git a/suites/upgrade/basic/tasks/upgrade_mds_mon_osd.yaml b/suites/upgrade/basic/tasks/upgrade_mds_mon_osd.yaml
deleted file mode 100644 (file)
index 8c48c2e..0000000
--- a/suites/upgrade/basic/tasks/upgrade_mds_mon_osd.yaml
+++ /dev/null
@@ -1,27 +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:
-- ceph-fuse:
-- workunit:
-     clients:
-        client.0:
-           - suites/blogbench.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:
-           - suites/blogbench.sh

diff --git a/suites/upgrade/basic/tasks/upgrade_mds_osd_mon.yaml b/suites/upgrade/basic/tasks/upgrade_mds_osd_mon.yaml
deleted file mode 100644 (file)
index 2865b17..0000000
--- a/suites/upgrade/basic/tasks/upgrade_mds_osd_mon.yaml
+++ /dev/null
@@ -1,27 +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:
-- ceph-fuse:
-- workunit:
-     clients:
-        client.0:
-           - suites/fsstress.sh
-- 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:
-           - suites/fsstress.sh

diff --git a/suites/upgrade/basic/tasks/upgrade_mon_mds_osd.yaml b/suites/upgrade/basic/tasks/upgrade_mon_mds_osd.yaml
deleted file mode 100644 (file)
index 42c7596..0000000
--- a/suites/upgrade/basic/tasks/upgrade_mon_mds_osd.yaml
+++ /dev/null
@@ -1,28 +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:
-- ceph-fuse:
-- workunit:
-     clients:
-        client.0:
-           - suites/bonnie.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:
-           - suites/bonnie.sh
-

diff --git a/suites/upgrade/basic/tasks/upgrade_mon_osd_mds.yaml b/suites/upgrade/basic/tasks/upgrade_mon_osd_mds.yaml
deleted file mode 100644 (file)
index d349c14..0000000
--- a/suites/upgrade/basic/tasks/upgrade_mon_osd_mds.yaml
+++ /dev/null
@@ -1,27 +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:
-- ceph-fuse:
-- workunit:
-     clients:
-        client.0:
-           - suites/blogbench.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:
-           - suites/blogbench.sh

diff --git a/suites/upgrade/basic/tasks/upgrade_osd_mds_mon.yaml b/suites/upgrade/basic/tasks/upgrade_osd_mds_mon.yaml
deleted file mode 100644 (file)
index e80d762..0000000
--- a/suites/upgrade/basic/tasks/upgrade_osd_mds_mon.yaml
+++ /dev/null
@@ -1,28 +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:
-- ceph-fuse:
-- workunit:
-     clients:
-        client.0:
-           - suites/blogbench.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:
-           - suites/blogbench.sh
-

diff --git a/suites/upgrade/basic/tasks/upgrade_osd_mon_mds.yaml b/suites/upgrade/basic/tasks/upgrade_osd_mon_mds.yaml
deleted file mode 100644 (file)
index 13a3f3c..0000000
--- a/suites/upgrade/basic/tasks/upgrade_osd_mon_mds.yaml
+++ /dev/null
@@ -1,27 +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:
-- ceph-fuse:
-- workunit:
-     clients:
-        client.0:
-           - suites/blogbench.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:
-           - suites/blogbench.sh

diff --git a/suites/upgrade/rados/a/start.yaml b/suites/upgrade/rados/a/start.yaml
new file mode 100644 (file)
index 0000000..c23b2a9
--- /dev/null
+++ b/suites/upgrade/rados/a/start.yaml
@@ -0,0 +1,21 @@
+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-mix.sh
+- install.upgrade:
+     all:
+        branch: next

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

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

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

diff --git a/suites/upgrade/rados/b/upgrade_mon_osd_mds.yaml b/suites/upgrade/rados/b/upgrade_mon_osd_mds.yaml
new file mode 100644 (file)
index 0000000..31a79e4
--- /dev/null
+++ b/suites/upgrade/rados/b/upgrade_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/rados/b/upgrade_osd_mds_mon.yaml b/suites/upgrade/rados/b/upgrade_osd_mds_mon.yaml
new file mode 100644 (file)
index 0000000..dbcd013
--- /dev/null
+++ b/suites/upgrade/rados/b/upgrade_osd_mds_mon.yaml
@@ -0,0 +1,2 @@
+tasks:
+- ceph.restart: [osd.0, osd.1, osd.2, osd.3, mds.a, mon.a, mon.b, mon.c]

diff --git a/suites/upgrade/rados/b/upgrade_osd_mon_mds.yaml b/suites/upgrade/rados/b/upgrade_osd_mon_mds.yaml
new file mode 100644 (file)
index 0000000..e8fe288
--- /dev/null
+++ b/suites/upgrade/rados/b/upgrade_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/rados/c/tail.yaml b/suites/upgrade/rados/c/tail.yaml
new file mode 100644 (file)
index 0000000..ce99dbd
--- /dev/null
+++ b/suites/upgrade/rados/c/tail.yaml
@@ -0,0 +1,5 @@
+tasks:
+- workunit:
+     clients:
+        client.0:
+           - rados/test.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
deleted file mode 100644 (file)
index d9d67dd..0000000
--- a/suites/upgrade/rados/tasks/upgrade_mds_first_rados_api_python.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:
-           - rados/test_python.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:
-           - 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
deleted file mode 100644 (file)
index 5ae2c70..0000000
--- a/suites/upgrade/rados/tasks/upgrade_mds_first_rados_loadgen_big.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:
-           - rados/load-gen-big.sh
-- 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:
-           - 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
deleted file mode 100644 (file)
index 27dc585..0000000
--- a/suites/upgrade/rados/tasks/upgrade_mon_first_rados_api_python.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:
-           - rados/test_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:
-           - 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
deleted file mode 100644 (file)
index d56ccd5..0000000
--- a/suites/upgrade/rados/tasks/upgrade_mon_first_rados_loadgen_big.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:
-           - rados/load-gen-big.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:
-           - 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
deleted file mode 100644 (file)
index 9630392..0000000
--- a/suites/upgrade/rados/tasks/upgrade_osd_first_rados_api_python.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:
-           - rados/test_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:
-           - 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
deleted file mode 100644 (file)
index b17b3c6..0000000
--- a/suites/upgrade/rados/tasks/upgrade_osd_first_rados_loadgen_big.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:
-           - rados/load-gen-big.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:
-           - rados/load-gen-big.sh