upgrade: rgw: restructure collection

- use separate facets
- make final swift use client.1 so it doesn't
collide with a previous run

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

diff --git a/suites/upgrade/rgw/b/s3readwrite.yaml b/suites/upgrade/rgw/b/s3readwrite.yaml
new file mode 100644 (file)
index 0000000..d3166f1
--- /dev/null
+++ b/suites/upgrade/rgw/b/s3readwrite.yaml
@@ -0,0 +1,13 @@
+tasks:
+- s3readwrite:
+    client.0:
+      rgw_server: client.0
+      readwrite:
+        bucket: rwtest
+        readers: 10
+        writers: 3
+        duration: 300
+        files:
+          num: 10
+          size: 2000
+          stddev: 500

diff --git a/suites/upgrade/rgw/b/s3tests.yaml b/suites/upgrade/rgw/b/s3tests.yaml
new file mode 100644 (file)
index 0000000..573cffb
--- /dev/null
+++ b/suites/upgrade/rgw/b/s3tests.yaml
@@ -0,0 +1,4 @@
+tasks:
+- s3tests:
+    client.0:
+      rgw_server: client.0

diff --git a/suites/upgrade/rgw/b/swift.yaml b/suites/upgrade/rgw/b/swift.yaml
new file mode 100644 (file)
index 0000000..45e2fc9
--- /dev/null
+++ b/suites/upgrade/rgw/b/swift.yaml
@@ -0,0 +1,4 @@
+tasks:
+- swift:
+    client.0:
+      rgw_server: client.0

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

diff --git a/suites/upgrade/rgw/d/mon-osd-mds.yaml b/suites/upgrade/rgw/d/mon-osd-mds.yaml
new file mode 100644 (file)
index 0000000..31a79e4
--- /dev/null
+++ b/suites/upgrade/rgw/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/rgw/d/osd-mon-mds.yaml b/suites/upgrade/rgw/d/osd-mon-mds.yaml
new file mode 100644 (file)
index 0000000..e8fe288
--- /dev/null
+++ b/suites/upgrade/rgw/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/rgw/e/readwrite.yaml b/suites/upgrade/rgw/e/readwrite.yaml
new file mode 100644 (file)
index 0000000..d3166f1
--- /dev/null
+++ b/suites/upgrade/rgw/e/readwrite.yaml
@@ -0,0 +1,13 @@
+tasks:
+- s3readwrite:
+    client.0:
+      rgw_server: client.0
+      readwrite:
+        bucket: rwtest
+        readers: 10
+        writers: 3
+        duration: 300
+        files:
+          num: 10
+          size: 2000
+          stddev: 500

diff --git a/suites/upgrade/rgw/e/s3tests.yaml b/suites/upgrade/rgw/e/s3tests.yaml
new file mode 100644 (file)
index 0000000..573cffb
--- /dev/null
+++ b/suites/upgrade/rgw/e/s3tests.yaml
@@ -0,0 +1,4 @@
+tasks:
+- s3tests:
+    client.0:
+      rgw_server: client.0

diff --git a/suites/upgrade/rgw/e/swift.yaml b/suites/upgrade/rgw/e/swift.yaml
new file mode 100644 (file)
index 0000000..7314a61
--- /dev/null
+++ b/suites/upgrade/rgw/e/swift.yaml
@@ -0,0 +1,4 @@
+tasks:
+- swift:
+    client.1:
+      rgw_server: client.0

diff --git a/suites/upgrade/rgw/tasks/upgrade_mds_mon_first_rgw_swift.yaml b/suites/upgrade/rgw/tasks/upgrade_mds_mon_first_rgw_swift.yaml
deleted file mode 100644 (file)
index 4bd7ad8..0000000
--- a/suites/upgrade/rgw/tasks/upgrade_mds_mon_first_rgw_swift.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:
-- rgw: [client.0]
-- swift:
-    client.0:
-      rgw_server: client.0
-- install.upgrade:
-     all:
-        branch: next
-- ceph.restart: [mds.a, mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3]
-- swift:
-    client.0:
-      rgw_server: client.0

diff --git a/suites/upgrade/rgw/tasks/upgrade_mds_osd_first_rgw_s3tests.yaml b/suites/upgrade/rgw/tasks/upgrade_mds_osd_first_rgw_s3tests.yaml
deleted file mode 100644 (file)
index 5487d39..0000000
--- a/suites/upgrade/rgw/tasks/upgrade_mds_osd_first_rgw_s3tests.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:
-- 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]
-- s3tests:
-    client.0:
-      rgw_server: client.0

diff --git a/suites/upgrade/rgw/tasks/upgrade_mon_mds_first_rgw_swift.yaml b/suites/upgrade/rgw/tasks/upgrade_mon_mds_first_rgw_swift.yaml
deleted file mode 100644 (file)
index 15d4122..0000000
--- a/suites/upgrade/rgw/tasks/upgrade_mon_mds_first_rgw_swift.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:
-- rgw: [client.0]
-- s3tests:
-    client.0:
-      rgw_server: client.0
-- install.upgrade:
-     all:
-        branch: next
-- ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3]
-- swift:
-    client.0:
-      rgw_server: client.0

diff --git a/suites/upgrade/rgw/tasks/upgrade_mon_osd_first_rgw_read_write.yaml b/suites/upgrade/rgw/tasks/upgrade_mon_osd_first_rgw_read_write.yaml
deleted file mode 100644 (file)
index c0e7d2a..0000000
--- a/suites/upgrade/rgw/tasks/upgrade_mon_osd_first_rgw_read_write.yaml
+++ /dev/null
@@ -1,34 +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:
-- rgw: [client.0]
-- swift:
-    client.0:
-      rgw_server: client.0
-- install.upgrade:
-     all:
-        branch: next
-- ceph.restart: [mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3, mds.a]
-- s3readwrite:
-    client.0:
-      rgw_server: client.0
-      readwrite:
-        bucket: rwtest
-        readers: 10
-        writers: 3
-        duration: 300
-        files:
-          num: 10
-          size: 2000
-          stddev: 500

diff --git a/suites/upgrade/rgw/tasks/upgrade_osd_mds_first_rgw_swift.yaml b/suites/upgrade/rgw/tasks/upgrade_osd_mds_first_rgw_swift.yaml
deleted file mode 100644 (file)
index 19b9e74..0000000
--- a/suites/upgrade/rgw/tasks/upgrade_osd_mds_first_rgw_swift.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:
-- rgw: [client.0]
-- s3tests:
-    client.0:
-      rgw_server: client.0
-- install.upgrade:
-     all:
-        branch: next
-- ceph.restart: [osd.0, osd.1, osd.2, osd.3, mds.a, mon.a, mon.b, mon.c]
-- swift:
-    client.0:
-      rgw_server: client.0

diff --git a/suites/upgrade/rgw/tasks/upgrade_osd_mon_first_rgw_read_write.yaml b/suites/upgrade/rgw/tasks/upgrade_osd_mon_first_rgw_read_write.yaml
deleted file mode 100644 (file)
index b684fff..0000000
--- a/suites/upgrade/rgw/tasks/upgrade_osd_mon_first_rgw_read_write.yaml
+++ /dev/null
@@ -1,34 +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:
-- rgw: [client.0]
-- swift:
-    client.0:
-      rgw_server: client.0
-- install.upgrade:
-     all:
-        branch: next
-- ceph.restart: [osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c, mds.a]
-- s3readwrite:
-    client.0:
-      rgw_server: client.0
-      readwrite:
-        bucket: rwtest
-        readers: 10
-        writers: 3
-        duration: 300
-        files:
-          num: 10
-          size: 2000
-          stddev: 500