From: Sage Weil <sage@redhat.com>
Date: Wed, 29 Oct 2014 21:26:14 +0000 (-0700)
Subject: upgrade/firefly-x: sync with giant
X-Git-Tag: v0.94.10~27^2^2~247
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4c90d9dbb7fd83e565b637661145beb1a6c158f0;p=ceph.git

upgrade/firefly-x: sync with giant
---

diff --git a/suites/upgrade/firefly-x/parallel/2-workload/+ b/suites/upgrade/firefly-x/parallel/2-workload/+
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/suites/upgrade/firefly-x/parallel/4-final-upgrade/client.yaml b/suites/upgrade/firefly-x/parallel/4-final-upgrade/client.yaml
deleted file mode 100644
index cf35d41e6c53..000000000000
--- a/suites/upgrade/firefly-x/parallel/4-final-upgrade/client.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-  - install.upgrade:
-      client.0:
-  - print: "**** done install.upgrade"
diff --git a/suites/upgrade/firefly-x/parallel/4-final-workload/+ b/suites/upgrade/firefly-x/parallel/4-final-workload/+
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/suites/upgrade/firefly-x/parallel/4-final-workload/rados-snaps-few-objects.yaml b/suites/upgrade/firefly-x/parallel/4-final-workload/rados-snaps-few-objects.yaml
new file mode 100644
index 000000000000..40f66da37f25
--- /dev/null
+++ b/suites/upgrade/firefly-x/parallel/4-final-workload/rados-snaps-few-objects.yaml
@@ -0,0 +1,12 @@
+tasks:
+  - rados:
+      clients: [client.1]
+      ops: 4000
+      objects: 50
+      op_weights:
+        read: 100
+        write: 100
+        delete: 50
+        snap_create: 50
+        snap_remove: 50
+        rollback: 50
diff --git a/suites/upgrade/firefly-x/parallel/4-final-workload/rados_loadgenmix.yaml b/suites/upgrade/firefly-x/parallel/4-final-workload/rados_loadgenmix.yaml
new file mode 100644
index 000000000000..faa96ed24d52
--- /dev/null
+++ b/suites/upgrade/firefly-x/parallel/4-final-workload/rados_loadgenmix.yaml
@@ -0,0 +1,5 @@
+tasks:
+  - workunit:
+      clients:
+        client.1:
+          - rados/load-gen-mix.sh
diff --git a/suites/upgrade/firefly-x/parallel/4-final-workload/rados_mon_thrash.yaml b/suites/upgrade/firefly-x/parallel/4-final-workload/rados_mon_thrash.yaml
new file mode 100644
index 000000000000..88019bef17ad
--- /dev/null
+++ b/suites/upgrade/firefly-x/parallel/4-final-workload/rados_mon_thrash.yaml
@@ -0,0 +1,8 @@
+tasks:
+  - mon_thrash:
+      revive_delay: 20
+      thrash_delay: 1
+  - workunit:
+      clients:
+        client.1:
+          - rados/test.sh
diff --git a/suites/upgrade/firefly-x/parallel/4-final-workload/rbd_cls.yaml b/suites/upgrade/firefly-x/parallel/4-final-workload/rbd_cls.yaml
new file mode 100644
index 000000000000..4ef47768237e
--- /dev/null
+++ b/suites/upgrade/firefly-x/parallel/4-final-workload/rbd_cls.yaml
@@ -0,0 +1,6 @@
+tasks:
+  - workunit:
+      clients:
+        client.1:
+          - cls/test_cls_rbd.sh
+
diff --git a/suites/upgrade/firefly-x/parallel/4-final-workload/rbd_import_export.yaml b/suites/upgrade/firefly-x/parallel/4-final-workload/rbd_import_export.yaml
new file mode 100644
index 000000000000..6c40377324d4
--- /dev/null
+++ b/suites/upgrade/firefly-x/parallel/4-final-workload/rbd_import_export.yaml
@@ -0,0 +1,7 @@
+tasks:
+  - workunit:
+      clients:
+        client.1:
+          - rbd/import_export.sh
+      env:
+        RBD_CREATE_ARGS: --new-format
diff --git a/suites/upgrade/firefly-x/parallel/4-final-workload/rgw_swift.yaml b/suites/upgrade/firefly-x/parallel/4-final-workload/rgw_swift.yaml
new file mode 100644
index 000000000000..445224cef2dc
--- /dev/null
+++ b/suites/upgrade/firefly-x/parallel/4-final-workload/rgw_swift.yaml
@@ -0,0 +1,5 @@
+tasks:
+  - rgw: [client.1]
+  - swift:
+      client.1:
+        rgw_server: client.1
diff --git a/suites/upgrade/firefly-x/parallel/5-final-workload/rados-snaps-few-objects.yaml b/suites/upgrade/firefly-x/parallel/5-final-workload/rados-snaps-few-objects.yaml
deleted file mode 100644
index 40f66da37f25..000000000000
--- a/suites/upgrade/firefly-x/parallel/5-final-workload/rados-snaps-few-objects.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-tasks:
-  - rados:
-      clients: [client.1]
-      ops: 4000
-      objects: 50
-      op_weights:
-        read: 100
-        write: 100
-        delete: 50
-        snap_create: 50
-        snap_remove: 50
-        rollback: 50
diff --git a/suites/upgrade/firefly-x/parallel/5-final-workload/rados_loadgenmix.yaml b/suites/upgrade/firefly-x/parallel/5-final-workload/rados_loadgenmix.yaml
deleted file mode 100644
index faa96ed24d52..000000000000
--- a/suites/upgrade/firefly-x/parallel/5-final-workload/rados_loadgenmix.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-  - workunit:
-      clients:
-        client.1:
-          - rados/load-gen-mix.sh
diff --git a/suites/upgrade/firefly-x/parallel/5-final-workload/rados_mon_thrash.yaml b/suites/upgrade/firefly-x/parallel/5-final-workload/rados_mon_thrash.yaml
deleted file mode 100644
index 88019bef17ad..000000000000
--- a/suites/upgrade/firefly-x/parallel/5-final-workload/rados_mon_thrash.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-  - mon_thrash:
-      revive_delay: 20
-      thrash_delay: 1
-  - workunit:
-      clients:
-        client.1:
-          - rados/test.sh
diff --git a/suites/upgrade/firefly-x/parallel/5-final-workload/rbd_cls.yaml b/suites/upgrade/firefly-x/parallel/5-final-workload/rbd_cls.yaml
deleted file mode 100644
index 4ef47768237e..000000000000
--- a/suites/upgrade/firefly-x/parallel/5-final-workload/rbd_cls.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-  - workunit:
-      clients:
-        client.1:
-          - cls/test_cls_rbd.sh
-
diff --git a/suites/upgrade/firefly-x/parallel/5-final-workload/rbd_import_export.yaml b/suites/upgrade/firefly-x/parallel/5-final-workload/rbd_import_export.yaml
deleted file mode 100644
index 6c40377324d4..000000000000
--- a/suites/upgrade/firefly-x/parallel/5-final-workload/rbd_import_export.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-  - workunit:
-      clients:
-        client.1:
-          - rbd/import_export.sh
-      env:
-        RBD_CREATE_ARGS: --new-format
diff --git a/suites/upgrade/firefly-x/parallel/5-final-workload/rgw_s3tests.yaml b/suites/upgrade/firefly-x/parallel/5-final-workload/rgw_s3tests.yaml
deleted file mode 100644
index 53ceb786ba0e..000000000000
--- a/suites/upgrade/firefly-x/parallel/5-final-workload/rgw_s3tests.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-  - rgw: [client.1]
-  - s3tests:
-      client.1:
-        rgw_server: client.1
-        branch: dumpling
diff --git a/suites/upgrade/firefly-x/parallel/5-final-workload/rgw_swift.yaml b/suites/upgrade/firefly-x/parallel/5-final-workload/rgw_swift.yaml
deleted file mode 100644
index 445224cef2dc..000000000000
--- a/suites/upgrade/firefly-x/parallel/5-final-workload/rgw_swift.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-  - rgw: [client.1]
-  - swift:
-      client.1:
-        rgw_server: client.1
diff --git a/suites/upgrade/firefly-x/stress-split/3-thrash/default.yaml b/suites/upgrade/firefly-x/stress-split/3-thrash/default.yaml
index 5a834c6da5d6..21d4c7520759 100644
--- a/suites/upgrade/firefly-x/stress-split/3-thrash/default.yaml
+++ b/suites/upgrade/firefly-x/stress-split/3-thrash/default.yaml
@@ -9,4 +9,3 @@ tasks:
     timeout: 1200
     chance_pgnum_grow: 1
     chance_pgpnum_fix: 1
-
diff --git a/suites/upgrade/firefly-x/stress-split/5-workload/+ b/suites/upgrade/firefly-x/stress-split/5-workload/+
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/suites/upgrade/firefly-x/stress-split/7-workload/+ b/suites/upgrade/firefly-x/stress-split/7-workload/+
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/suites/upgrade/firefly-x/stress-split/8-next-mon/monc.yaml b/suites/upgrade/firefly-x/stress-split/8-next-mon/monc.yaml
index 73f22bd5f7cf..e9273236ba33 100644
--- a/suites/upgrade/firefly-x/stress-split/8-next-mon/monc.yaml
+++ b/suites/upgrade/firefly-x/stress-split/8-next-mon/monc.yaml
@@ -1,6 +1,4 @@
 tasks:
-- install.upgrade:
-    mon.c:
 - ceph.restart:
     daemons: [mon.c]
     wait-for-healthy: false