From 3a5cdb1ec7caecb138146ab6aa9ddb0424304f5b Mon Sep 17 00:00:00 2001
From: tamil <tamil@tamil-VirtualBox.(none)>
Date: Thu, 11 Jul 2013 15:54:12 -0700
Subject: [PATCH] added upgrade task for mixed mon test

Signed-off-by: tamil <tamil@tamil-VirtualBox.(none)>
---
 suites/upgrade/mixed-mons/0-cluster/start.yaml        | 11 +++++++++++
 .../mixed-mons/1-cuttlefish-install/cuttlefish.yaml   |  5 +++++
 .../mixed-mons/2-cuttlefish-workload/cephtool.yaml    |  7 +++++++
 .../mixed-mons/3-partial-mon-upgrade/next.yaml        |  4 ++++
 suites/upgrade/mixed-mons/4-mon-restart/restart.yaml  |  2 ++
 .../upgrade/mixed-mons/5-next-workload/cephtool.yaml  |  6 ++++++
 6 files changed, 35 insertions(+)
 create mode 100644 suites/upgrade/mixed-mons/0-cluster/start.yaml
 create mode 100644 suites/upgrade/mixed-mons/1-cuttlefish-install/cuttlefish.yaml
 create mode 100644 suites/upgrade/mixed-mons/2-cuttlefish-workload/cephtool.yaml
 create mode 100644 suites/upgrade/mixed-mons/3-partial-mon-upgrade/next.yaml
 create mode 100644 suites/upgrade/mixed-mons/4-mon-restart/restart.yaml
 create mode 100644 suites/upgrade/mixed-mons/5-next-workload/cephtool.yaml

diff --git a/suites/upgrade/mixed-mons/0-cluster/start.yaml b/suites/upgrade/mixed-mons/0-cluster/start.yaml
new file mode 100644
index 00000000000..0a85eacad7f
--- /dev/null
+++ b/suites/upgrade/mixed-mons/0-cluster/start.yaml
@@ -0,0 +1,11 @@
+roles:
+- - mon.a
+  - mds.a
+  - osd.0
+  - osd.1
+- - mon.b
+  - mon.c
+  - osd.2
+  - osd.3
+- - client.0
+
diff --git a/suites/upgrade/mixed-mons/1-cuttlefish-install/cuttlefish.yaml b/suites/upgrade/mixed-mons/1-cuttlefish-install/cuttlefish.yaml
new file mode 100644
index 00000000000..50b65f72bca
--- /dev/null
+++ b/suites/upgrade/mixed-mons/1-cuttlefish-install/cuttlefish.yaml
@@ -0,0 +1,5 @@
+tasks:
+- install:
+    branch: cuttlefish
+- ceph:
+
diff --git a/suites/upgrade/mixed-mons/2-cuttlefish-workload/cephtool.yaml b/suites/upgrade/mixed-mons/2-cuttlefish-workload/cephtool.yaml
new file mode 100644
index 00000000000..ec40c058e43
--- /dev/null
+++ b/suites/upgrade/mixed-mons/2-cuttlefish-workload/cephtool.yaml
@@ -0,0 +1,7 @@
+- workunit:
+    branch: cuttlefish
+    clients:
+      all:
+        - cephtool
+        - mon/pool_ops.sh
+
diff --git a/suites/upgrade/mixed-mons/3-partial-mon-upgrade/next.yaml b/suites/upgrade/mixed-mons/3-partial-mon-upgrade/next.yaml
new file mode 100644
index 00000000000..2910abc384f
--- /dev/null
+++ b/suites/upgrade/mixed-mons/3-partial-mon-upgrade/next.yaml
@@ -0,0 +1,4 @@
+tasks:
+- install.upgrade:
+     mon.a:
+        branch: next
diff --git a/suites/upgrade/mixed-mons/4-mon-restart/restart.yaml b/suites/upgrade/mixed-mons/4-mon-restart/restart.yaml
new file mode 100644
index 00000000000..8181413055c
--- /dev/null
+++ b/suites/upgrade/mixed-mons/4-mon-restart/restart.yaml
@@ -0,0 +1,2 @@
+tasks:
+- ceph.restart: [mon.a]
diff --git a/suites/upgrade/mixed-mons/5-next-workload/cephtool.yaml b/suites/upgrade/mixed-mons/5-next-workload/cephtool.yaml
new file mode 100644
index 00000000000..02cbf5561fe
--- /dev/null
+++ b/suites/upgrade/mixed-mons/5-next-workload/cephtool.yaml
@@ -0,0 +1,6 @@
+- workunit:
+    branch: cuttlefish
+    clients:
+      all:
+        - cephtool
+        - mon/pool_ops.sh