From: tamil <tamil.muthamizhan@inktank.com>
Date: Wed, 17 Apr 2013 21:43:52 +0000 (-0700)
Subject: rgw suite for upgrade task
X-Git-Tag: v0.94.10~27^2^2~755
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=551860fabdb63b3363199be2932d893c4de124a6;p=ceph.git

rgw suite for upgrade task

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

diff --git a/suites/upgrade/rgw/tasks/upgrade_mds_first_rgw_s3tests.yaml b/suites/upgrade/rgw/tasks/upgrade_mds_first_rgw_s3tests.yaml
deleted file mode 100644
index f31d368e5ee6..000000000000
--- a/suites/upgrade/rgw/tasks/upgrade_mds_first_rgw_s3tests.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:
-- 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
-
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
new file mode 100644
index 000000000000..1867babd2cdf
--- /dev/null
+++ b/suites/upgrade/rgw/tasks/upgrade_mds_mon_first_rgw_swift.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:
+- 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]
+- rgw: [client.0]
+- 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
new file mode 100644
index 000000000000..684ee0bc258b
--- /dev/null
+++ b/suites/upgrade/rgw/tasks/upgrade_mds_osd_first_rgw_s3tests.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:
+- 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
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
new file mode 100644
index 000000000000..2d1ba44c570c
--- /dev/null
+++ b/suites/upgrade/rgw/tasks/upgrade_mon_mds_first_rgw_swift.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:
+- 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]
+- rgw: [client.0]
+- 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
new file mode 100644
index 000000000000..90c79095cc4f
--- /dev/null
+++ b/suites/upgrade/rgw/tasks/upgrade_mon_osd_first_rgw_read_write.yaml
@@ -0,0 +1,35 @@
+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]
+- rgw: [client.0]
+- 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
new file mode 100644
index 000000000000..3d345395e096
--- /dev/null
+++ b/suites/upgrade/rgw/tasks/upgrade_osd_mds_first_rgw_swift.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:
+- 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]
+- rgw: [client.0]
+- 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
new file mode 100644
index 000000000000..3469b87bb971
--- /dev/null
+++ b/suites/upgrade/rgw/tasks/upgrade_osd_mon_first_rgw_read_write.yaml
@@ -0,0 +1,35 @@
+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]
+- rgw: [client.0]
+- s3readwrite:
+    client.0:
+      rgw_server: client.0
+      readwrite:
+        bucket: rwtest
+        readers: 10
+        writers: 3
+        duration: 300
+        files:
+          num: 10
+          size: 2000
+          stddev: 500