segregating the upgrade suite based on modules

Signed-off-by: tamil <tamil.muthamizhan@inktank.com
(cherry picked from commit 0183db285c95cd4383085db2c5cf4fb0e74b99a6)

diff --git a/suites/upgrade-mixed-cluster/mixed-cluster/% b/suites/upgrade-mixed-cluster/mixed-cluster/%
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/suites/upgrade-mixed-cluster/mixed-cluster/0-cluster/start.yaml b/suites/upgrade-mixed-cluster/mixed-cluster/0-cluster/start.yaml
new file mode 100644 (file)
index 0000000..0a85eac
--- /dev/null
+++ b/suites/upgrade-mixed-cluster/mixed-cluster/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-cluster/mixed-cluster/1-cuttlefish-install/cuttlefish.yaml b/suites/upgrade-mixed-cluster/mixed-cluster/1-cuttlefish-install/cuttlefish.yaml
new file mode 100644 (file)
index 0000000..50b65f7
--- /dev/null
+++ b/suites/upgrade-mixed-cluster/mixed-cluster/1-cuttlefish-install/cuttlefish.yaml
@@ -0,0 +1,5 @@
+tasks:
+- install:
+    branch: cuttlefish
+- ceph:
+

diff --git a/suites/upgrade-mixed-cluster/mixed-cluster/2-cuttlefish-workload/api.yaml b/suites/upgrade-mixed-cluster/mixed-cluster/2-cuttlefish-workload/api.yaml
new file mode 100644 (file)
index 0000000..ad36bdd
--- /dev/null
+++ b/suites/upgrade-mixed-cluster/mixed-cluster/2-cuttlefish-workload/api.yaml
@@ -0,0 +1,8 @@
+tasks:
+- workunit:
+    branch: cuttlefish
+    clients:
+      client.0:
+        - rados/test.sh
+        - cls
+

diff --git a/suites/upgrade-mixed-cluster/mixed-cluster/2-cuttlefish-workload/load-gen-mix.yaml b/suites/upgrade-mixed-cluster/mixed-cluster/2-cuttlefish-workload/load-gen-mix.yaml
new file mode 100644 (file)
index 0000000..7ec655c
--- /dev/null
+++ b/suites/upgrade-mixed-cluster/mixed-cluster/2-cuttlefish-workload/load-gen-mix.yaml
@@ -0,0 +1,6 @@
+tasks:
+- workunit:
+    branch: cuttlefish
+    clients:
+      client.0:
+        - rados/load-gen-mix.sh

diff --git a/suites/upgrade-mixed-cluster/mixed-cluster/3-partial-osds-upgrade/dumpling.yaml b/suites/upgrade-mixed-cluster/mixed-cluster/3-partial-osds-upgrade/dumpling.yaml
new file mode 100644 (file)
index 0000000..a9b9bf8
--- /dev/null
+++ b/suites/upgrade-mixed-cluster/mixed-cluster/3-partial-osds-upgrade/dumpling.yaml
@@ -0,0 +1,7 @@
+tasks:
+- install.upgrade:
+     osd.0:
+        branch: dumpling
+     osd.2:
+        branch: dumpling
+

diff --git a/suites/upgrade-mixed-cluster/mixed-cluster/4-osds-restart/restart.yaml b/suites/upgrade-mixed-cluster/mixed-cluster/4-osds-restart/restart.yaml
new file mode 100644 (file)
index 0000000..3a84bbb
--- /dev/null
+++ b/suites/upgrade-mixed-cluster/mixed-cluster/4-osds-restart/restart.yaml
@@ -0,0 +1,2 @@
+tasks:
+- ceph.restart: [osd.0, osd.2]

diff --git a/suites/upgrade-mixed-cluster/mixed-cluster/5-mixed-workload/api.yaml b/suites/upgrade-mixed-cluster/mixed-cluster/5-mixed-workload/api.yaml
new file mode 100644 (file)
index 0000000..ad36bdd
--- /dev/null
+++ b/suites/upgrade-mixed-cluster/mixed-cluster/5-mixed-workload/api.yaml
@@ -0,0 +1,8 @@
+tasks:
+- workunit:
+    branch: cuttlefish
+    clients:
+      client.0:
+        - rados/test.sh
+        - cls
+

diff --git a/suites/upgrade-mixed-cluster/mixed-cluster/5-mixed-workload/load-gen-big.yaml b/suites/upgrade-mixed-cluster/mixed-cluster/5-mixed-workload/load-gen-big.yaml
new file mode 100644 (file)
index 0000000..0f6e616
--- /dev/null
+++ b/suites/upgrade-mixed-cluster/mixed-cluster/5-mixed-workload/load-gen-big.yaml
@@ -0,0 +1,6 @@
+tasks:
+- workunit:
+    branch: cuttlefish
+    clients:
+      client.0:
+        - rados/load-gen-big.sh

diff --git a/suites/upgrade-mixed-mons/mixed-mons/% b/suites/upgrade-mixed-mons/mixed-mons/%
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/suites/upgrade-mixed-mons/mixed-mons/0-cluster/start.yaml b/suites/upgrade-mixed-mons/mixed-mons/0-cluster/start.yaml
new file mode 100644 (file)
index 0000000..0a85eac
--- /dev/null
+++ b/suites/upgrade-mixed-mons/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/mixed-mons/1-cuttlefish-install/cuttlefish.yaml b/suites/upgrade-mixed-mons/mixed-mons/1-cuttlefish-install/cuttlefish.yaml
new file mode 100644 (file)
index 0000000..50b65f7
--- /dev/null
+++ b/suites/upgrade-mixed-mons/mixed-mons/1-cuttlefish-install/cuttlefish.yaml
@@ -0,0 +1,5 @@
+tasks:
+- install:
+    branch: cuttlefish
+- ceph:
+

diff --git a/suites/upgrade-mixed-mons/mixed-mons/2-cuttlefish-workload/cephtool.yaml b/suites/upgrade-mixed-mons/mixed-mons/2-cuttlefish-workload/cephtool.yaml
new file mode 100644 (file)
index 0000000..8648784
--- /dev/null
+++ b/suites/upgrade-mixed-mons/mixed-mons/2-cuttlefish-workload/cephtool.yaml
@@ -0,0 +1,7 @@
+tasks:
+- workunit:
+    branch: cuttlefish
+    clients:
+      all:
+        - cephtool/test.sh
+        - mon/pool_ops.sh

diff --git a/suites/upgrade-mixed-mons/mixed-mons/3-partial-mon-upgrade/dumpling.yaml b/suites/upgrade-mixed-mons/mixed-mons/3-partial-mon-upgrade/dumpling.yaml
new file mode 100644 (file)
index 0000000..6c9d320
--- /dev/null
+++ b/suites/upgrade-mixed-mons/mixed-mons/3-partial-mon-upgrade/dumpling.yaml
@@ -0,0 +1,4 @@
+tasks:
+- install.upgrade:
+     mon.a:
+        branch: dumpling

diff --git a/suites/upgrade-mixed-mons/mixed-mons/4-mon-restart/restart.yaml b/suites/upgrade-mixed-mons/mixed-mons/4-mon-restart/restart.yaml
new file mode 100644 (file)
index 0000000..b6ffb33
--- /dev/null
+++ b/suites/upgrade-mixed-mons/mixed-mons/4-mon-restart/restart.yaml
@@ -0,0 +1,5 @@
+tasks:
+- ceph.restart:
+    daemons: [mon.a]
+    wait-for-healthy: false
+    wait-for-osds-up: true

diff --git a/suites/upgrade-mixed-mons/mixed-mons/5-mixed-workload/cephtool.yaml b/suites/upgrade-mixed-mons/mixed-mons/5-mixed-workload/cephtool.yaml
new file mode 100644 (file)
index 0000000..8648784
--- /dev/null
+++ b/suites/upgrade-mixed-mons/mixed-mons/5-mixed-workload/cephtool.yaml
@@ -0,0 +1,7 @@
+tasks:
+- workunit:
+    branch: cuttlefish
+    clients:
+      all:
+        - cephtool/test.sh
+        - mon/pool_ops.sh

diff --git a/suites/upgrade-mixed-mons/mixed-mons/6-rest/rest.yaml b/suites/upgrade-mixed-mons/mixed-mons/6-rest/rest.yaml
new file mode 100644 (file)
index 0000000..18ae735
--- /dev/null
+++ b/suites/upgrade-mixed-mons/mixed-mons/6-rest/rest.yaml
@@ -0,0 +1,26 @@
+overrides:
+  ceph:
+    log-whitelist:
+    - wrongly marked me down
+    - had wrong client addr
+    - had wrong cluster addr
+tasks:
+- install.upgrade:
+    mon.b:
+      branch: dumpling
+    client.0:
+      branch: dumpling
+- ceph.restart:
+    daemons:
+    - mon.b
+    - mon.c
+    - osd.0
+    - osd.1
+    - osd.2
+    - osd.3
+- workunit:
+    branch: dumpling
+    clients:
+      all:
+      - cephtool/test.sh
+      - mon/pool_ops.sh

diff --git a/suites/upgrade-rados-double/rados-double/% b/suites/upgrade-rados-double/rados-double/%
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/suites/upgrade-rados-double/rados-double/0-cluster/start.yaml b/suites/upgrade-rados-double/rados-double/0-cluster/start.yaml
new file mode 100644 (file)
index 0000000..01747e4
--- /dev/null
+++ b/suites/upgrade-rados-double/rados-double/0-cluster/start.yaml
@@ -0,0 +1,10 @@
+roles:
+- - mon.a
+  - mds.a
+  - osd.0
+  - osd.1
+- - mon.b
+  - mon.c
+  - osd.2
+  - osd.3
+- - client.0

diff --git a/suites/upgrade-rados-double/rados-double/1-bobtail-install/bobtail.yaml b/suites/upgrade-rados-double/rados-double/1-bobtail-install/bobtail.yaml
new file mode 100644 (file)
index 0000000..c676a55
--- /dev/null
+++ b/suites/upgrade-rados-double/rados-double/1-bobtail-install/bobtail.yaml
@@ -0,0 +1,4 @@
+tasks:
+- install:
+     branch: bobtail
+- ceph:

diff --git a/suites/upgrade-rados-double/rados-double/2-bobtail-workload/api.yaml b/suites/upgrade-rados-double/rados-double/2-bobtail-workload/api.yaml
new file mode 100644 (file)
index 0000000..637b7a8
--- /dev/null
+++ b/suites/upgrade-rados-double/rados-double/2-bobtail-workload/api.yaml
@@ -0,0 +1,6 @@
+tasks:
+- workunit:
+    branch: bobtail
+    clients:
+      client.0:
+        - rados/test.sh

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

diff --git a/suites/upgrade-rados-double/rados-double/4-restart/upgrade_mon_mds_osd.yaml b/suites/upgrade-rados-double/rados-double/4-restart/upgrade_mon_mds_osd.yaml
new file mode 100644 (file)
index 0000000..78e14e9
--- /dev/null
+++ b/suites/upgrade-rados-double/rados-double/4-restart/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-double/rados-double/4-restart/upgrade_osd_mds_mon.yaml b/suites/upgrade-rados-double/rados-double/4-restart/upgrade_osd_mds_mon.yaml
new file mode 100644 (file)
index 0000000..dbcd013
--- /dev/null
+++ b/suites/upgrade-rados-double/rados-double/4-restart/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-double/rados-double/5-dumpling-workload/api.yaml b/suites/upgrade-rados-double/rados-double/5-dumpling-workload/api.yaml
new file mode 100644 (file)
index 0000000..b091ecc
--- /dev/null
+++ b/suites/upgrade-rados-double/rados-double/5-dumpling-workload/api.yaml
@@ -0,0 +1,7 @@
+tasks:
+- workunit:
+    branch: dumpling
+    clients:
+      client.0:
+        - rados/test.sh
+        - cls

diff --git a/suites/upgrade-rados-double/rados-double/5-dumpling-workload/load-gen-mix.yaml b/suites/upgrade-rados-double/rados-double/5-dumpling-workload/load-gen-mix.yaml
new file mode 100644 (file)
index 0000000..e89d1f5
--- /dev/null
+++ b/suites/upgrade-rados-double/rados-double/5-dumpling-workload/load-gen-mix.yaml
@@ -0,0 +1,6 @@
+tasks:
+- workunit:
+    branch: dumpling
+    clients:
+      client.0:
+        - rados/load-gen-mix.sh

diff --git a/suites/upgrade-rados-double/rados-double/6-upgrade-next/next.yaml b/suites/upgrade-rados-double/rados-double/6-upgrade-next/next.yaml
new file mode 100644 (file)
index 0000000..bb34346
--- /dev/null
+++ b/suites/upgrade-rados-double/rados-double/6-upgrade-next/next.yaml
@@ -0,0 +1,3 @@
+tasks:
+- install.upgrade:
+     all:

diff --git a/suites/upgrade-rados-double/rados-double/7-restart/mon-mds-osd.yaml b/suites/upgrade-rados-double/rados-double/7-restart/mon-mds-osd.yaml
new file mode 100644 (file)
index 0000000..78e14e9
--- /dev/null
+++ b/suites/upgrade-rados-double/rados-double/7-restart/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-double/rados-double/7-restart/osd-mds-mon.yaml b/suites/upgrade-rados-double/rados-double/7-restart/osd-mds-mon.yaml
new file mode 100644 (file)
index 0000000..dbcd013
--- /dev/null
+++ b/suites/upgrade-rados-double/rados-double/7-restart/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-double/rados-double/8-next-workload/api.yaml b/suites/upgrade-rados-double/rados-double/8-next-workload/api.yaml
new file mode 100644 (file)
index 0000000..9b9f1f2
--- /dev/null
+++ b/suites/upgrade-rados-double/rados-double/8-next-workload/api.yaml
@@ -0,0 +1,6 @@
+tasks:
+- workunit:
+    clients:
+      client.0:
+        - rados/test.sh
+        - cls

diff --git a/suites/upgrade-rados-double/rados-double/8-next-workload/snaps-few-objects.yaml b/suites/upgrade-rados-double/rados-double/8-next-workload/snaps-few-objects.yaml
new file mode 100644 (file)
index 0000000..aa82d97
--- /dev/null
+++ b/suites/upgrade-rados-double/rados-double/8-next-workload/snaps-few-objects.yaml
@@ -0,0 +1,13 @@
+tasks:
+- rados:
+    clients: [client.0]
+    ops: 4000
+    objects: 50
+    op_weights:
+      read: 100
+      write: 100
+      delete: 50
+      snap_create: 50
+      snap_remove: 50
+      rollback: 50
+      copy_from: 50

diff --git a/suites/upgrade-rados/rados/% b/suites/upgrade-rados/rados/%
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/suites/upgrade-rados/rados/0-cluster/start.yaml b/suites/upgrade-rados/rados/0-cluster/start.yaml
new file mode 100644 (file)
index 0000000..01747e4
--- /dev/null
+++ b/suites/upgrade-rados/rados/0-cluster/start.yaml
@@ -0,0 +1,10 @@
+roles:
+- - mon.a
+  - mds.a
+  - osd.0
+  - osd.1
+- - mon.b
+  - mon.c
+  - osd.2
+  - osd.3
+- - client.0

diff --git a/suites/upgrade-rados/rados/1-cuttlefish-install/cuttlefish.yaml b/suites/upgrade-rados/rados/1-cuttlefish-install/cuttlefish.yaml
new file mode 100644 (file)
index 0000000..b259af9
--- /dev/null
+++ b/suites/upgrade-rados/rados/1-cuttlefish-install/cuttlefish.yaml
@@ -0,0 +1,4 @@
+tasks:
+- install:
+    branch: cuttlefish
+- ceph:

diff --git a/suites/upgrade-rados/rados/2-cuttlefish-workload/api.yaml b/suites/upgrade-rados/rados/2-cuttlefish-workload/api.yaml
new file mode 100644 (file)
index 0000000..6652658
--- /dev/null
+++ b/suites/upgrade-rados/rados/2-cuttlefish-workload/api.yaml
@@ -0,0 +1,7 @@
+tasks:
+- workunit:
+    branch: cuttlefish
+    clients:
+      client.0:
+        - rados/test.sh
+        - cls

diff --git a/suites/upgrade-rados/rados/2-cuttlefish-workload/load-gen-mix.yaml b/suites/upgrade-rados/rados/2-cuttlefish-workload/load-gen-mix.yaml
new file mode 100644 (file)
index 0000000..7ec655c
--- /dev/null
+++ b/suites/upgrade-rados/rados/2-cuttlefish-workload/load-gen-mix.yaml
@@ -0,0 +1,6 @@
+tasks:
+- workunit:
+    branch: cuttlefish
+    clients:
+      client.0:
+        - rados/load-gen-mix.sh

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

diff --git a/suites/upgrade-rados/rados/4-restart/upgrade_mds_mon_osd.yaml b/suites/upgrade-rados/rados/4-restart/upgrade_mds_mon_osd.yaml
new file mode 100644 (file)
index 0000000..d218006
--- /dev/null
+++ b/suites/upgrade-rados/rados/4-restart/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/rados/4-restart/upgrade_mon_mds_osd.yaml b/suites/upgrade-rados/rados/4-restart/upgrade_mon_mds_osd.yaml
new file mode 100644 (file)
index 0000000..78e14e9
--- /dev/null
+++ b/suites/upgrade-rados/rados/4-restart/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/rados/4-restart/upgrade_osd_mon_mds.yaml b/suites/upgrade-rados/rados/4-restart/upgrade_osd_mon_mds.yaml
new file mode 100644 (file)
index 0000000..e8fe288
--- /dev/null
+++ b/suites/upgrade-rados/rados/4-restart/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/rados/5-dumpling-workload/api.yaml b/suites/upgrade-rados/rados/5-dumpling-workload/api.yaml
new file mode 100644 (file)
index 0000000..b091ecc
--- /dev/null
+++ b/suites/upgrade-rados/rados/5-dumpling-workload/api.yaml
@@ -0,0 +1,7 @@
+tasks:
+- workunit:
+    branch: dumpling
+    clients:
+      client.0:
+        - rados/test.sh
+        - cls

diff --git a/suites/upgrade-rados/rados/5-dumpling-workload/snaps-few-objects.yaml b/suites/upgrade-rados/rados/5-dumpling-workload/snaps-few-objects.yaml
new file mode 100644 (file)
index 0000000..c540397
--- /dev/null
+++ b/suites/upgrade-rados/rados/5-dumpling-workload/snaps-few-objects.yaml
@@ -0,0 +1,12 @@
+tasks:
+- rados:
+    clients: [client.0]
+    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-rados/rados/6-upgrade-emp/emperor.yaml b/suites/upgrade-rados/rados/6-upgrade-emp/emperor.yaml
new file mode 100644 (file)
index 0000000..e473f31
--- /dev/null
+++ b/suites/upgrade-rados/rados/6-upgrade-emp/emperor.yaml
@@ -0,0 +1,4 @@
+tasks:
+- install.upgrade:
+     all:
+        branch: emperor

diff --git a/suites/upgrade-rados/rados/7-restart/upgrade_mds_mon_osd.yaml b/suites/upgrade-rados/rados/7-restart/upgrade_mds_mon_osd.yaml
new file mode 100644 (file)
index 0000000..d218006
--- /dev/null
+++ b/suites/upgrade-rados/rados/7-restart/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/rados/7-restart/upgrade_mon_mds_osd.yaml b/suites/upgrade-rados/rados/7-restart/upgrade_mon_mds_osd.yaml
new file mode 100644 (file)
index 0000000..78e14e9
--- /dev/null
+++ b/suites/upgrade-rados/rados/7-restart/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/rados/7-restart/upgrade_osd_mds_mon.yaml b/suites/upgrade-rados/rados/7-restart/upgrade_osd_mds_mon.yaml
new file mode 100644 (file)
index 0000000..dbcd013
--- /dev/null
+++ b/suites/upgrade-rados/rados/7-restart/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/rados/8-emperor-workload/api.yaml b/suites/upgrade-rados/rados/8-emperor-workload/api.yaml
new file mode 100644 (file)
index 0000000..29a4be1
--- /dev/null
+++ b/suites/upgrade-rados/rados/8-emperor-workload/api.yaml
@@ -0,0 +1,7 @@
+tasks:
+- workunit:
+    branch: emperor
+    clients:
+      client.0:
+        - rados/test.sh
+        - cls

diff --git a/suites/upgrade-rados/rados/8-emperor-workload/snaps-few-objects.yaml b/suites/upgrade-rados/rados/8-emperor-workload/snaps-few-objects.yaml
new file mode 100644 (file)
index 0000000..c540397
--- /dev/null
+++ b/suites/upgrade-rados/rados/8-emperor-workload/snaps-few-objects.yaml
@@ -0,0 +1,12 @@
+tasks:
+- rados:
+    clients: [client.0]
+    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-rbd-double/rbd-double/% b/suites/upgrade-rbd-double/rbd-double/%
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/suites/upgrade-rbd-double/rbd-double/0-cluster/start.yaml b/suites/upgrade-rbd-double/rbd-double/0-cluster/start.yaml
new file mode 100644 (file)
index 0000000..01747e4
--- /dev/null
+++ b/suites/upgrade-rbd-double/rbd-double/0-cluster/start.yaml
@@ -0,0 +1,10 @@
+roles:
+- - mon.a
+  - mds.a
+  - osd.0
+  - osd.1
+- - mon.b
+  - mon.c
+  - osd.2
+  - osd.3
+- - client.0

diff --git a/suites/upgrade-rbd-double/rbd-double/1-bobtail-install/bobtail.yaml b/suites/upgrade-rbd-double/rbd-double/1-bobtail-install/bobtail.yaml
new file mode 100644 (file)
index 0000000..c676a55
--- /dev/null
+++ b/suites/upgrade-rbd-double/rbd-double/1-bobtail-install/bobtail.yaml
@@ -0,0 +1,4 @@
+tasks:
+- install:
+     branch: bobtail
+- ceph:

diff --git a/suites/upgrade-rbd-double/rbd-double/2-bobtail-workload/import_export.yaml b/suites/upgrade-rbd-double/rbd-double/2-bobtail-workload/import_export.yaml
new file mode 100644 (file)
index 0000000..9123db8
--- /dev/null
+++ b/suites/upgrade-rbd-double/rbd-double/2-bobtail-workload/import_export.yaml
@@ -0,0 +1,8 @@
+tasks:
+- workunit:
+     branch: bobtail
+     clients:
+        client.0:
+           - rbd/import_export.sh
+     env:
+        RBD_CREATE_ARGS: --new-format

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

diff --git a/suites/upgrade-rbd-double/rbd-double/4-restart/upgrade_mon_mds_osd.yaml b/suites/upgrade-rbd-double/rbd-double/4-restart/upgrade_mon_mds_osd.yaml
new file mode 100644 (file)
index 0000000..78e14e9
--- /dev/null
+++ b/suites/upgrade-rbd-double/rbd-double/4-restart/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-rbd-double/rbd-double/4-restart/upgrade_osd_mds_mon.yaml b/suites/upgrade-rbd-double/rbd-double/4-restart/upgrade_osd_mds_mon.yaml
new file mode 100644 (file)
index 0000000..dbcd013
--- /dev/null
+++ b/suites/upgrade-rbd-double/rbd-double/4-restart/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-rbd-double/rbd-double/5-dumpling-workload/api.yaml b/suites/upgrade-rbd-double/rbd-double/5-dumpling-workload/api.yaml
new file mode 100644 (file)
index 0000000..bbcde3e
--- /dev/null
+++ b/suites/upgrade-rbd-double/rbd-double/5-dumpling-workload/api.yaml
@@ -0,0 +1,6 @@
+tasks:
+- workunit:
+     branch: dumpling
+     clients:
+        client.0:
+           - rbd/test_librbd.sh

diff --git a/suites/upgrade-rbd-double/rbd-double/5-dumpling-workload/cls.yaml b/suites/upgrade-rbd-double/rbd-double/5-dumpling-workload/cls.yaml
new file mode 100644 (file)
index 0000000..c8079e3
--- /dev/null
+++ b/suites/upgrade-rbd-double/rbd-double/5-dumpling-workload/cls.yaml
@@ -0,0 +1,6 @@
+tasks:
+- workunit:
+     branch: dumpling
+     clients:
+        client.0:
+           - cls/test_cls_rbd.sh

diff --git a/suites/upgrade-rbd-double/rbd-double/6-upgrade-next/next.yaml b/suites/upgrade-rbd-double/rbd-double/6-upgrade-next/next.yaml
new file mode 100644 (file)
index 0000000..bb34346
--- /dev/null
+++ b/suites/upgrade-rbd-double/rbd-double/6-upgrade-next/next.yaml
@@ -0,0 +1,3 @@
+tasks:
+- install.upgrade:
+     all:

diff --git a/suites/upgrade-rbd-double/rbd-double/7-restart/mon-mds-osd.yaml b/suites/upgrade-rbd-double/rbd-double/7-restart/mon-mds-osd.yaml
new file mode 100644 (file)
index 0000000..78e14e9
--- /dev/null
+++ b/suites/upgrade-rbd-double/rbd-double/7-restart/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-rbd-double/rbd-double/7-restart/osd-mds-mon.yaml b/suites/upgrade-rbd-double/rbd-double/7-restart/osd-mds-mon.yaml
new file mode 100644 (file)
index 0000000..dbcd013
--- /dev/null
+++ b/suites/upgrade-rbd-double/rbd-double/7-restart/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-rbd-double/rbd-double/8-next-workload/import-export.yaml b/suites/upgrade-rbd-double/rbd-double/8-next-workload/import-export.yaml
new file mode 100644 (file)
index 0000000..ae44a87
--- /dev/null
+++ b/suites/upgrade-rbd-double/rbd-double/8-next-workload/import-export.yaml
@@ -0,0 +1,7 @@
+tasks:
+- workunit:
+     clients:
+        client.0:
+           - rbd/import_export.sh
+     env:
+        RBD_CREATE_ARGS: --new-format

diff --git a/suites/upgrade-rbd-double/rbd-double/8-next-workload/python.yaml b/suites/upgrade-rbd-double/rbd-double/8-next-workload/python.yaml
new file mode 100644 (file)
index 0000000..5c6df6e
--- /dev/null
+++ b/suites/upgrade-rbd-double/rbd-double/8-next-workload/python.yaml
@@ -0,0 +1,5 @@
+tasks:
+- workunit:
+     clients:
+        client.0:
+           - rbd/test_librbd_python.sh

diff --git a/suites/upgrade-rbd/rbd/% b/suites/upgrade-rbd/rbd/%
new file mode 100644 (file)
index 0000000..e69de29

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

diff --git a/suites/upgrade-rbd/rbd/1-bobtail-workload/import_export.yaml b/suites/upgrade-rbd/rbd/1-bobtail-workload/import_export.yaml
new file mode 100644 (file)
index 0000000..9123db8
--- /dev/null
+++ b/suites/upgrade-rbd/rbd/1-bobtail-workload/import_export.yaml
@@ -0,0 +1,8 @@
+tasks:
+- workunit:
+     branch: bobtail
+     clients:
+        client.0:
+           - rbd/import_export.sh
+     env:
+        RBD_CREATE_ARGS: --new-format

diff --git a/suites/upgrade-rbd/rbd/2-upgrade-to-dumpling/upgrade.yaml b/suites/upgrade-rbd/rbd/2-upgrade-to-dumpling/upgrade.yaml
new file mode 100644 (file)
index 0000000..e3e332c
--- /dev/null
+++ b/suites/upgrade-rbd/rbd/2-upgrade-to-dumpling/upgrade.yaml
@@ -0,0 +1,4 @@
+tasks:
+- install.upgrade:
+     all:
+        branch: dumpling

diff --git a/suites/upgrade-rbd/rbd/3-restart/mon-osd-mds.yaml b/suites/upgrade-rbd/rbd/3-restart/mon-osd-mds.yaml
new file mode 100644 (file)
index 0000000..31a79e4
--- /dev/null
+++ b/suites/upgrade-rbd/rbd/3-restart/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-rbd/rbd/3-restart/osd-mon-mds.yaml b/suites/upgrade-rbd/rbd/3-restart/osd-mon-mds.yaml
new file mode 100644 (file)
index 0000000..e8fe288
--- /dev/null
+++ b/suites/upgrade-rbd/rbd/3-restart/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-rbd/rbd/4-dumpling-workload/api.yaml b/suites/upgrade-rbd/rbd/4-dumpling-workload/api.yaml
new file mode 100644 (file)
index 0000000..bbcde3e
--- /dev/null
+++ b/suites/upgrade-rbd/rbd/4-dumpling-workload/api.yaml
@@ -0,0 +1,6 @@
+tasks:
+- workunit:
+     branch: dumpling
+     clients:
+        client.0:
+           - rbd/test_librbd.sh

diff --git a/suites/upgrade-rbd/rbd/4-dumpling-workload/cls.yaml b/suites/upgrade-rbd/rbd/4-dumpling-workload/cls.yaml
new file mode 100644 (file)
index 0000000..c8079e3
--- /dev/null
+++ b/suites/upgrade-rbd/rbd/4-dumpling-workload/cls.yaml
@@ -0,0 +1,6 @@
+tasks:
+- workunit:
+     branch: dumpling
+     clients:
+        client.0:
+           - cls/test_cls_rbd.sh

diff --git a/suites/upgrade-rbd/rbd/4-dumpling-workload/import-export.yaml b/suites/upgrade-rbd/rbd/4-dumpling-workload/import-export.yaml
new file mode 100644 (file)
index 0000000..364ef25
--- /dev/null
+++ b/suites/upgrade-rbd/rbd/4-dumpling-workload/import-export.yaml
@@ -0,0 +1,8 @@
+tasks:
+- workunit:
+     branch: dumpling
+     clients:
+        client.0:
+           - rbd/import_export.sh
+     env:
+        RBD_CREATE_ARGS: --new-format

diff --git a/suites/upgrade-rbd/rbd/4-dumpling-workload/python.yaml b/suites/upgrade-rbd/rbd/4-dumpling-workload/python.yaml
new file mode 100644 (file)
index 0000000..737a821
--- /dev/null
+++ b/suites/upgrade-rbd/rbd/4-dumpling-workload/python.yaml
@@ -0,0 +1,6 @@
+tasks:
+- workunit:
+     branch: dumpling
+     clients:
+        client.0:
+           - rbd/test_librbd_python.sh

diff --git a/suites/upgrade-rbd/rbd/5-upgrade-to-emperor/upgrade.yaml b/suites/upgrade-rbd/rbd/5-upgrade-to-emperor/upgrade.yaml
new file mode 100644 (file)
index 0000000..e473f31
--- /dev/null
+++ b/suites/upgrade-rbd/rbd/5-upgrade-to-emperor/upgrade.yaml
@@ -0,0 +1,4 @@
+tasks:
+- install.upgrade:
+     all:
+        branch: emperor

diff --git a/suites/upgrade-rbd/rbd/6-restart/mon-osd-mds.yaml b/suites/upgrade-rbd/rbd/6-restart/mon-osd-mds.yaml
new file mode 100644 (file)
index 0000000..31a79e4
--- /dev/null
+++ b/suites/upgrade-rbd/rbd/6-restart/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-rbd/rbd/6-restart/osd-mon-mds.yaml b/suites/upgrade-rbd/rbd/6-restart/osd-mon-mds.yaml
new file mode 100644 (file)
index 0000000..e8fe288
--- /dev/null
+++ b/suites/upgrade-rbd/rbd/6-restart/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-rbd/rbd/7-emperor-workload/import_export.yaml b/suites/upgrade-rbd/rbd/7-emperor-workload/import_export.yaml
new file mode 100644 (file)
index 0000000..e297887
--- /dev/null
+++ b/suites/upgrade-rbd/rbd/7-emperor-workload/import_export.yaml
@@ -0,0 +1,8 @@
+tasks:
+- workunit:
+     branch: emperor
+     clients:
+        client.0:
+           - rbd/import_export.sh
+     env:
+        RBD_CREATE_ARGS: --new-format

diff --git a/suites/upgrade-rgw-double/rgw-double/% b/suites/upgrade-rgw-double/rgw-double/%
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/suites/upgrade-rgw-double/rgw-double/0-cluster/start.yaml b/suites/upgrade-rgw-double/rgw-double/0-cluster/start.yaml
new file mode 100644 (file)
index 0000000..01747e4
--- /dev/null
+++ b/suites/upgrade-rgw-double/rgw-double/0-cluster/start.yaml
@@ -0,0 +1,10 @@
+roles:
+- - mon.a
+  - mds.a
+  - osd.0
+  - osd.1
+- - mon.b
+  - mon.c
+  - osd.2
+  - osd.3
+- - client.0

diff --git a/suites/upgrade-rgw-double/rgw-double/1-bobtail-install/bobtail.yaml b/suites/upgrade-rgw-double/rgw-double/1-bobtail-install/bobtail.yaml
new file mode 100644 (file)
index 0000000..ca81c71
--- /dev/null
+++ b/suites/upgrade-rgw-double/rgw-double/1-bobtail-install/bobtail.yaml
@@ -0,0 +1,5 @@
+tasks:
+- install:
+     branch: bobtail
+- ceph:
+- rgw:

diff --git a/suites/upgrade-rgw-double/rgw-double/2-bobtail-workload/s3tests.yaml b/suites/upgrade-rgw-double/rgw-double/2-bobtail-workload/s3tests.yaml
new file mode 100644 (file)
index 0000000..7397ae6
--- /dev/null
+++ b/suites/upgrade-rgw-double/rgw-double/2-bobtail-workload/s3tests.yaml
@@ -0,0 +1,5 @@
+tasks:
+- s3tests:
+    client.0:
+      force-branch: bobtail
+      rgw_server: client.0

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

diff --git a/suites/upgrade-rgw-double/rgw-double/4-restart/upgrade_mon_mds_osd.yaml b/suites/upgrade-rgw-double/rgw-double/4-restart/upgrade_mon_mds_osd.yaml
new file mode 100644 (file)
index 0000000..8666590
--- /dev/null
+++ b/suites/upgrade-rgw-double/rgw-double/4-restart/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, rgw.client.0]

diff --git a/suites/upgrade-rgw-double/rgw-double/4-restart/upgrade_osd_mds_mon.yaml b/suites/upgrade-rgw-double/rgw-double/4-restart/upgrade_osd_mds_mon.yaml
new file mode 100644 (file)
index 0000000..425cf60
--- /dev/null
+++ b/suites/upgrade-rgw-double/rgw-double/4-restart/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, rgw.client.0]

diff --git a/suites/upgrade-rgw-double/rgw-double/5-dumpling-workload/readwrite.yaml b/suites/upgrade-rgw-double/rgw-double/5-dumpling-workload/readwrite.yaml
new file mode 100644 (file)
index 0000000..d3166f1
--- /dev/null
+++ b/suites/upgrade-rgw-double/rgw-double/5-dumpling-workload/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-double/rgw-double/5-dumpling-workload/s3tests.yaml b/suites/upgrade-rgw-double/rgw-double/5-dumpling-workload/s3tests.yaml
new file mode 100644 (file)
index 0000000..6506960
--- /dev/null
+++ b/suites/upgrade-rgw-double/rgw-double/5-dumpling-workload/s3tests.yaml
@@ -0,0 +1,5 @@
+tasks:
+- s3tests:
+    client.0:
+      force-branch: dumpling
+      rgw_server: client.0

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

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

diff --git a/suites/upgrade-rgw-double/rgw-double/7-restart/mon-mds-osd.yaml b/suites/upgrade-rgw-double/rgw-double/7-restart/mon-mds-osd.yaml
new file mode 100644 (file)
index 0000000..8666590
--- /dev/null
+++ b/suites/upgrade-rgw-double/rgw-double/7-restart/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, rgw.client.0]

diff --git a/suites/upgrade-rgw-double/rgw-double/7-restart/osd-mds-mon.yaml b/suites/upgrade-rgw-double/rgw-double/7-restart/osd-mds-mon.yaml
new file mode 100644 (file)
index 0000000..425cf60
--- /dev/null
+++ b/suites/upgrade-rgw-double/rgw-double/7-restart/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, rgw.client.0]

diff --git a/suites/upgrade-rgw-double/rgw-double/8-next-workload/readwrite.yaml b/suites/upgrade-rgw-double/rgw-double/8-next-workload/readwrite.yaml
new file mode 100644 (file)
index 0000000..d3166f1
--- /dev/null
+++ b/suites/upgrade-rgw-double/rgw-double/8-next-workload/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-double/rgw-double/8-next-workload/s3tests.yaml b/suites/upgrade-rgw-double/rgw-double/8-next-workload/s3tests.yaml
new file mode 100644 (file)
index 0000000..573cffb
--- /dev/null
+++ b/suites/upgrade-rgw-double/rgw-double/8-next-workload/s3tests.yaml
@@ -0,0 +1,4 @@
+tasks:
+- s3tests:
+    client.0:
+      rgw_server: client.0

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

diff --git a/suites/upgrade-rgw/rgw/% b/suites/upgrade-rgw/rgw/%
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/suites/upgrade-rgw/rgw/0-cluster/start.yaml b/suites/upgrade-rgw/rgw/0-cluster/start.yaml
new file mode 100644 (file)
index 0000000..8b1ebbe
--- /dev/null
+++ b/suites/upgrade-rgw/rgw/0-cluster/start.yaml
@@ -0,0 +1,20 @@
+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:
+    conf:
+      client:
+        client mount timeout: 600
+        rgw init timeout: 600
+- rgw: [client.0]

diff --git a/suites/upgrade-rgw/rgw/1-bobtail-workload/s3readwrite.yaml b/suites/upgrade-rgw/rgw/1-bobtail-workload/s3readwrite.yaml
new file mode 100644 (file)
index 0000000..d3166f1
--- /dev/null
+++ b/suites/upgrade-rgw/rgw/1-bobtail-workload/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/rgw/1-bobtail-workload/s3tests.yaml b/suites/upgrade-rgw/rgw/1-bobtail-workload/s3tests.yaml
new file mode 100644 (file)
index 0000000..8020d79
--- /dev/null
+++ b/suites/upgrade-rgw/rgw/1-bobtail-workload/s3tests.yaml
@@ -0,0 +1,5 @@
+tasks:
+- s3tests:
+    client.0:
+      rgw_server: client.0
+      force-branch: bobtail

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

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

diff --git a/suites/upgrade-rgw/rgw/3-restart/mon-osd-mds.yaml b/suites/upgrade-rgw/rgw/3-restart/mon-osd-mds.yaml
new file mode 100644 (file)
index 0000000..ea8a58c
--- /dev/null
+++ b/suites/upgrade-rgw/rgw/3-restart/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, rgw.client.0]

diff --git a/suites/upgrade-rgw/rgw/3-restart/osd-mon-mds.yaml b/suites/upgrade-rgw/rgw/3-restart/osd-mon-mds.yaml
new file mode 100644 (file)
index 0000000..f9606ef
--- /dev/null
+++ b/suites/upgrade-rgw/rgw/3-restart/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, rgw.client.0]

diff --git a/suites/upgrade-rgw/rgw/4-dumpling-workload/readwrite.yaml b/suites/upgrade-rgw/rgw/4-dumpling-workload/readwrite.yaml
new file mode 100644 (file)
index 0000000..d3166f1
--- /dev/null
+++ b/suites/upgrade-rgw/rgw/4-dumpling-workload/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/rgw/4-dumpling-workload/s3tests.yaml b/suites/upgrade-rgw/rgw/4-dumpling-workload/s3tests.yaml
new file mode 100644 (file)
index 0000000..6506960
--- /dev/null
+++ b/suites/upgrade-rgw/rgw/4-dumpling-workload/s3tests.yaml
@@ -0,0 +1,5 @@
+tasks:
+- s3tests:
+    client.0:
+      force-branch: dumpling
+      rgw_server: client.0

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

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

diff --git a/suites/upgrade-rgw/rgw/6-restart/mon-osd-mds.yaml b/suites/upgrade-rgw/rgw/6-restart/mon-osd-mds.yaml
new file mode 100644 (file)
index 0000000..ea8a58c
--- /dev/null
+++ b/suites/upgrade-rgw/rgw/6-restart/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, rgw.client.0]

diff --git a/suites/upgrade-rgw/rgw/6-restart/osd-mon-mds.yaml b/suites/upgrade-rgw/rgw/6-restart/osd-mon-mds.yaml
new file mode 100644 (file)
index 0000000..f9606ef
--- /dev/null
+++ b/suites/upgrade-rgw/rgw/6-restart/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, rgw.client.0]

diff --git a/suites/upgrade-rgw/rgw/7-emperor-workload/readwrite.yaml b/suites/upgrade-rgw/rgw/7-emperor-workload/readwrite.yaml
new file mode 100644 (file)
index 0000000..d3166f1
--- /dev/null
+++ b/suites/upgrade-rgw/rgw/7-emperor-workload/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/rgw/7-emperor-workload/s3tests.yaml b/suites/upgrade-rgw/rgw/7-emperor-workload/s3tests.yaml
new file mode 100644 (file)
index 0000000..cc9675c
--- /dev/null
+++ b/suites/upgrade-rgw/rgw/7-emperor-workload/s3tests.yaml
@@ -0,0 +1,5 @@
+tasks:
+- s3tests:
+    client.0:
+      force-branch: emperor
+      rgw_server: client.0

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

diff --git a/suites/upgrade/mixed-cluster/% b/suites/upgrade/mixed-cluster/%
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/upgrade/mixed-cluster/0-cluster/start.yaml b/suites/upgrade/mixed-cluster/0-cluster/start.yaml
deleted file mode 100644 (file)
index 0a85eac..0000000
--- a/suites/upgrade/mixed-cluster/0-cluster/start.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-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-cluster/1-cuttlefish-install/cuttlefish.yaml b/suites/upgrade/mixed-cluster/1-cuttlefish-install/cuttlefish.yaml
deleted file mode 100644 (file)
index 50b65f7..0000000
--- a/suites/upgrade/mixed-cluster/1-cuttlefish-install/cuttlefish.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- install:
-    branch: cuttlefish
-- ceph:
-

diff --git a/suites/upgrade/mixed-cluster/2-cuttlefish-workload/api.yaml b/suites/upgrade/mixed-cluster/2-cuttlefish-workload/api.yaml
deleted file mode 100644 (file)
index ad36bdd..0000000
--- a/suites/upgrade/mixed-cluster/2-cuttlefish-workload/api.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- workunit:
-    branch: cuttlefish
-    clients:
-      client.0:
-        - rados/test.sh
-        - cls
-

diff --git a/suites/upgrade/mixed-cluster/2-cuttlefish-workload/load-gen-mix.yaml b/suites/upgrade/mixed-cluster/2-cuttlefish-workload/load-gen-mix.yaml
deleted file mode 100644 (file)
index 7ec655c..0000000
--- a/suites/upgrade/mixed-cluster/2-cuttlefish-workload/load-gen-mix.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-    branch: cuttlefish
-    clients:
-      client.0:
-        - rados/load-gen-mix.sh

diff --git a/suites/upgrade/mixed-cluster/3-partial-osds-upgrade/dumpling.yaml b/suites/upgrade/mixed-cluster/3-partial-osds-upgrade/dumpling.yaml
deleted file mode 100644 (file)
index a9b9bf8..0000000
--- a/suites/upgrade/mixed-cluster/3-partial-osds-upgrade/dumpling.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install.upgrade:
-     osd.0:
-        branch: dumpling
-     osd.2:
-        branch: dumpling
-

diff --git a/suites/upgrade/mixed-cluster/4-osds-restart/restart.yaml b/suites/upgrade/mixed-cluster/4-osds-restart/restart.yaml
deleted file mode 100644 (file)
index 3a84bbb..0000000
--- a/suites/upgrade/mixed-cluster/4-osds-restart/restart.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-tasks:
-- ceph.restart: [osd.0, osd.2]

diff --git a/suites/upgrade/mixed-cluster/5-mixed-workload/api.yaml b/suites/upgrade/mixed-cluster/5-mixed-workload/api.yaml
deleted file mode 100644 (file)
index ad36bdd..0000000
--- a/suites/upgrade/mixed-cluster/5-mixed-workload/api.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- workunit:
-    branch: cuttlefish
-    clients:
-      client.0:
-        - rados/test.sh
-        - cls
-

diff --git a/suites/upgrade/mixed-cluster/5-mixed-workload/load-gen-big.yaml b/suites/upgrade/mixed-cluster/5-mixed-workload/load-gen-big.yaml
deleted file mode 100644 (file)
index 0f6e616..0000000
--- a/suites/upgrade/mixed-cluster/5-mixed-workload/load-gen-big.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-    branch: cuttlefish
-    clients:
-      client.0:
-        - rados/load-gen-big.sh

diff --git a/suites/upgrade/mixed-mons/% b/suites/upgrade/mixed-mons/%
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/upgrade/mixed-mons/0-cluster/start.yaml b/suites/upgrade/mixed-mons/0-cluster/start.yaml
deleted file mode 100644 (file)
index 0a85eac..0000000
--- a/suites/upgrade/mixed-mons/0-cluster/start.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-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
deleted file mode 100644 (file)
index 50b65f7..0000000
--- a/suites/upgrade/mixed-mons/1-cuttlefish-install/cuttlefish.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644 (file)
index 8648784..0000000
--- a/suites/upgrade/mixed-mons/2-cuttlefish-workload/cephtool.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- workunit:
-    branch: cuttlefish
-    clients:
-      all:
-        - cephtool/test.sh
-        - mon/pool_ops.sh

diff --git a/suites/upgrade/mixed-mons/3-partial-mon-upgrade/dumpling.yaml b/suites/upgrade/mixed-mons/3-partial-mon-upgrade/dumpling.yaml
deleted file mode 100644 (file)
index 6c9d320..0000000
--- a/suites/upgrade/mixed-mons/3-partial-mon-upgrade/dumpling.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- install.upgrade:
-     mon.a:
-        branch: dumpling

diff --git a/suites/upgrade/mixed-mons/4-mon-restart/restart.yaml b/suites/upgrade/mixed-mons/4-mon-restart/restart.yaml
deleted file mode 100644 (file)
index b6ffb33..0000000
--- a/suites/upgrade/mixed-mons/4-mon-restart/restart.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- ceph.restart:
-    daemons: [mon.a]
-    wait-for-healthy: false
-    wait-for-osds-up: true

diff --git a/suites/upgrade/mixed-mons/5-mixed-workload/cephtool.yaml b/suites/upgrade/mixed-mons/5-mixed-workload/cephtool.yaml
deleted file mode 100644 (file)
index 8648784..0000000
--- a/suites/upgrade/mixed-mons/5-mixed-workload/cephtool.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- workunit:
-    branch: cuttlefish
-    clients:
-      all:
-        - cephtool/test.sh
-        - mon/pool_ops.sh

diff --git a/suites/upgrade/mixed-mons/6-rest/rest.yaml b/suites/upgrade/mixed-mons/6-rest/rest.yaml
deleted file mode 100644 (file)
index 18ae735..0000000
--- a/suites/upgrade/mixed-mons/6-rest/rest.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-    - wrongly marked me down
-    - had wrong client addr
-    - had wrong cluster addr
-tasks:
-- install.upgrade:
-    mon.b:
-      branch: dumpling
-    client.0:
-      branch: dumpling
-- ceph.restart:
-    daemons:
-    - mon.b
-    - mon.c
-    - osd.0
-    - osd.1
-    - osd.2
-    - osd.3
-- workunit:
-    branch: dumpling
-    clients:
-      all:
-      - cephtool/test.sh
-      - mon/pool_ops.sh

diff --git a/suites/upgrade/rados-double/% b/suites/upgrade/rados-double/%
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/upgrade/rados-double/0-cluster/start.yaml b/suites/upgrade/rados-double/0-cluster/start.yaml
deleted file mode 100644 (file)
index 01747e4..0000000
--- a/suites/upgrade/rados-double/0-cluster/start.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-- - mon.b
-  - mon.c
-  - osd.2
-  - osd.3
-- - client.0

diff --git a/suites/upgrade/rados-double/1-bobtail-install/bobtail.yaml b/suites/upgrade/rados-double/1-bobtail-install/bobtail.yaml
deleted file mode 100644 (file)
index c676a55..0000000
--- a/suites/upgrade/rados-double/1-bobtail-install/bobtail.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- install:
-     branch: bobtail
-- ceph:

diff --git a/suites/upgrade/rados-double/2-bobtail-workload/api.yaml b/suites/upgrade/rados-double/2-bobtail-workload/api.yaml
deleted file mode 100644 (file)
index 637b7a8..0000000
--- a/suites/upgrade/rados-double/2-bobtail-workload/api.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-    branch: bobtail
-    clients:
-      client.0:
-        - rados/test.sh

diff --git a/suites/upgrade/rados-double/3-upgrade/dumpling.yaml b/suites/upgrade/rados-double/3-upgrade/dumpling.yaml
deleted file mode 100644 (file)
index e3e332c..0000000
--- a/suites/upgrade/rados-double/3-upgrade/dumpling.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- install.upgrade:
-     all:
-        branch: dumpling

diff --git a/suites/upgrade/rados-double/4-restart/upgrade_mon_mds_osd.yaml b/suites/upgrade/rados-double/4-restart/upgrade_mon_mds_osd.yaml
deleted file mode 100644 (file)
index 78e14e9..0000000
--- a/suites/upgrade/rados-double/4-restart/upgrade_mon_mds_osd.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-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-double/4-restart/upgrade_osd_mds_mon.yaml b/suites/upgrade/rados-double/4-restart/upgrade_osd_mds_mon.yaml
deleted file mode 100644 (file)
index dbcd013..0000000
--- a/suites/upgrade/rados-double/4-restart/upgrade_osd_mds_mon.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-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-double/5-dumpling-workload/api.yaml b/suites/upgrade/rados-double/5-dumpling-workload/api.yaml
deleted file mode 100644 (file)
index b091ecc..0000000
--- a/suites/upgrade/rados-double/5-dumpling-workload/api.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- workunit:
-    branch: dumpling
-    clients:
-      client.0:
-        - rados/test.sh
-        - cls

diff --git a/suites/upgrade/rados-double/5-dumpling-workload/load-gen-mix.yaml b/suites/upgrade/rados-double/5-dumpling-workload/load-gen-mix.yaml
deleted file mode 100644 (file)
index e89d1f5..0000000
--- a/suites/upgrade/rados-double/5-dumpling-workload/load-gen-mix.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-    branch: dumpling
-    clients:
-      client.0:
-        - rados/load-gen-mix.sh

diff --git a/suites/upgrade/rados-double/6-upgrade-next/next.yaml b/suites/upgrade/rados-double/6-upgrade-next/next.yaml
deleted file mode 100644 (file)
index bb34346..0000000
--- a/suites/upgrade/rados-double/6-upgrade-next/next.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-tasks:
-- install.upgrade:
-     all:

diff --git a/suites/upgrade/rados-double/7-restart/mon-mds-osd.yaml b/suites/upgrade/rados-double/7-restart/mon-mds-osd.yaml
deleted file mode 100644 (file)
index 78e14e9..0000000
--- a/suites/upgrade/rados-double/7-restart/mon-mds-osd.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-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-double/7-restart/osd-mds-mon.yaml b/suites/upgrade/rados-double/7-restart/osd-mds-mon.yaml
deleted file mode 100644 (file)
index dbcd013..0000000
--- a/suites/upgrade/rados-double/7-restart/osd-mds-mon.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-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-double/8-next-workload/api.yaml b/suites/upgrade/rados-double/8-next-workload/api.yaml
deleted file mode 100644 (file)
index 9b9f1f2..0000000
--- a/suites/upgrade/rados-double/8-next-workload/api.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      client.0:
-        - rados/test.sh
-        - cls

diff --git a/suites/upgrade/rados-double/8-next-workload/snaps-few-objects.yaml b/suites/upgrade/rados-double/8-next-workload/snaps-few-objects.yaml
deleted file mode 100644 (file)
index aa82d97..0000000
--- a/suites/upgrade/rados-double/8-next-workload/snaps-few-objects.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-tasks:
-- rados:
-    clients: [client.0]
-    ops: 4000
-    objects: 50
-    op_weights:
-      read: 100
-      write: 100
-      delete: 50
-      snap_create: 50
-      snap_remove: 50
-      rollback: 50
-      copy_from: 50

diff --git a/suites/upgrade/rados/% b/suites/upgrade/rados/%
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/upgrade/rados/0-cluster/start.yaml b/suites/upgrade/rados/0-cluster/start.yaml
deleted file mode 100644 (file)
index 01747e4..0000000
--- a/suites/upgrade/rados/0-cluster/start.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-- - mon.b
-  - mon.c
-  - osd.2
-  - osd.3
-- - client.0

diff --git a/suites/upgrade/rados/1-cuttlefish-install/cuttlefish.yaml b/suites/upgrade/rados/1-cuttlefish-install/cuttlefish.yaml
deleted file mode 100644 (file)
index b259af9..0000000
--- a/suites/upgrade/rados/1-cuttlefish-install/cuttlefish.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- install:
-    branch: cuttlefish
-- ceph:

diff --git a/suites/upgrade/rados/2-cuttlefish-workload/api.yaml b/suites/upgrade/rados/2-cuttlefish-workload/api.yaml
deleted file mode 100644 (file)
index 6652658..0000000
--- a/suites/upgrade/rados/2-cuttlefish-workload/api.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- workunit:
-    branch: cuttlefish
-    clients:
-      client.0:
-        - rados/test.sh
-        - cls

diff --git a/suites/upgrade/rados/2-cuttlefish-workload/load-gen-mix.yaml b/suites/upgrade/rados/2-cuttlefish-workload/load-gen-mix.yaml
deleted file mode 100644 (file)
index 7ec655c..0000000
--- a/suites/upgrade/rados/2-cuttlefish-workload/load-gen-mix.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-    branch: cuttlefish
-    clients:
-      client.0:
-        - rados/load-gen-mix.sh

diff --git a/suites/upgrade/rados/3-upgrade/dumpling.yaml b/suites/upgrade/rados/3-upgrade/dumpling.yaml
deleted file mode 100644 (file)
index e3e332c..0000000
--- a/suites/upgrade/rados/3-upgrade/dumpling.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- install.upgrade:
-     all:
-        branch: dumpling

diff --git a/suites/upgrade/rados/4-restart/upgrade_mds_mon_osd.yaml b/suites/upgrade/rados/4-restart/upgrade_mds_mon_osd.yaml
deleted file mode 100644 (file)
index d218006..0000000
--- a/suites/upgrade/rados/4-restart/upgrade_mds_mon_osd.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-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/4-restart/upgrade_mds_osd_mon.yaml b/suites/upgrade/rados/4-restart/upgrade_mds_osd_mon.yaml
deleted file mode 100644 (file)
index a850835..0000000
--- a/suites/upgrade/rados/4-restart/upgrade_mds_osd_mon.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-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/4-restart/upgrade_mon_mds_osd.yaml b/suites/upgrade/rados/4-restart/upgrade_mon_mds_osd.yaml
deleted file mode 100644 (file)
index 78e14e9..0000000
--- a/suites/upgrade/rados/4-restart/upgrade_mon_mds_osd.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-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/4-restart/upgrade_mon_osd_mds.yaml b/suites/upgrade/rados/4-restart/upgrade_mon_osd_mds.yaml
deleted file mode 100644 (file)
index 31a79e4..0000000
--- a/suites/upgrade/rados/4-restart/upgrade_mon_osd_mds.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-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/4-restart/upgrade_osd_mds_mon.yaml b/suites/upgrade/rados/4-restart/upgrade_osd_mds_mon.yaml
deleted file mode 100644 (file)
index dbcd013..0000000
--- a/suites/upgrade/rados/4-restart/upgrade_osd_mds_mon.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-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/4-restart/upgrade_osd_mon_mds.yaml b/suites/upgrade/rados/4-restart/upgrade_osd_mon_mds.yaml
deleted file mode 100644 (file)
index e8fe288..0000000
--- a/suites/upgrade/rados/4-restart/upgrade_osd_mon_mds.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-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/5-dumpling-workload/api.yaml b/suites/upgrade/rados/5-dumpling-workload/api.yaml
deleted file mode 100644 (file)
index b091ecc..0000000
--- a/suites/upgrade/rados/5-dumpling-workload/api.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- workunit:
-    branch: dumpling
-    clients:
-      client.0:
-        - rados/test.sh
-        - cls

diff --git a/suites/upgrade/rados/5-dumpling-workload/snaps-few-objects.yaml b/suites/upgrade/rados/5-dumpling-workload/snaps-few-objects.yaml
deleted file mode 100644 (file)
index c540397..0000000
--- a/suites/upgrade/rados/5-dumpling-workload/snaps-few-objects.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-tasks:
-- rados:
-    clients: [client.0]
-    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/rados/6-upgrade-emp/emperor.yaml b/suites/upgrade/rados/6-upgrade-emp/emperor.yaml
deleted file mode 100644 (file)
index e473f31..0000000
--- a/suites/upgrade/rados/6-upgrade-emp/emperor.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- install.upgrade:
-     all:
-        branch: emperor

diff --git a/suites/upgrade/rados/7-restart/upgrade_mds_mon_osd.yaml b/suites/upgrade/rados/7-restart/upgrade_mds_mon_osd.yaml
deleted file mode 100644 (file)
index d218006..0000000
--- a/suites/upgrade/rados/7-restart/upgrade_mds_mon_osd.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-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/7-restart/upgrade_mds_osd_mon.yaml b/suites/upgrade/rados/7-restart/upgrade_mds_osd_mon.yaml
deleted file mode 100644 (file)
index a850835..0000000
--- a/suites/upgrade/rados/7-restart/upgrade_mds_osd_mon.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-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/7-restart/upgrade_mon_mds_osd.yaml b/suites/upgrade/rados/7-restart/upgrade_mon_mds_osd.yaml
deleted file mode 100644 (file)
index 78e14e9..0000000
--- a/suites/upgrade/rados/7-restart/upgrade_mon_mds_osd.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-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/7-restart/upgrade_mon_osd_mds.yaml b/suites/upgrade/rados/7-restart/upgrade_mon_osd_mds.yaml
deleted file mode 100644 (file)
index 31a79e4..0000000
--- a/suites/upgrade/rados/7-restart/upgrade_mon_osd_mds.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-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/7-restart/upgrade_osd_mds_mon.yaml b/suites/upgrade/rados/7-restart/upgrade_osd_mds_mon.yaml
deleted file mode 100644 (file)
index dbcd013..0000000
--- a/suites/upgrade/rados/7-restart/upgrade_osd_mds_mon.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-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/7-restart/upgrade_osd_mon_mds.yaml b/suites/upgrade/rados/7-restart/upgrade_osd_mon_mds.yaml
deleted file mode 100644 (file)
index e8fe288..0000000
--- a/suites/upgrade/rados/7-restart/upgrade_osd_mon_mds.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-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/8-emperor-workload/api.yaml b/suites/upgrade/rados/8-emperor-workload/api.yaml
deleted file mode 100644 (file)
index 29a4be1..0000000
--- a/suites/upgrade/rados/8-emperor-workload/api.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- workunit:
-    branch: emperor
-    clients:
-      client.0:
-        - rados/test.sh
-        - cls

diff --git a/suites/upgrade/rados/8-emperor-workload/snaps-few-objects.yaml b/suites/upgrade/rados/8-emperor-workload/snaps-few-objects.yaml
deleted file mode 100644 (file)
index c540397..0000000
--- a/suites/upgrade/rados/8-emperor-workload/snaps-few-objects.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-tasks:
-- rados:
-    clients: [client.0]
-    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/rbd-double/% b/suites/upgrade/rbd-double/%
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/upgrade/rbd-double/0-cluster/start.yaml b/suites/upgrade/rbd-double/0-cluster/start.yaml
deleted file mode 100644 (file)
index 01747e4..0000000
--- a/suites/upgrade/rbd-double/0-cluster/start.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-- - mon.b
-  - mon.c
-  - osd.2
-  - osd.3
-- - client.0

diff --git a/suites/upgrade/rbd-double/1-bobtail-install/bobtail.yaml b/suites/upgrade/rbd-double/1-bobtail-install/bobtail.yaml
deleted file mode 100644 (file)
index c676a55..0000000
--- a/suites/upgrade/rbd-double/1-bobtail-install/bobtail.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- install:
-     branch: bobtail
-- ceph:

diff --git a/suites/upgrade/rbd-double/2-bobtail-workload/import_export.yaml b/suites/upgrade/rbd-double/2-bobtail-workload/import_export.yaml
deleted file mode 100644 (file)
index 9123db8..0000000
--- a/suites/upgrade/rbd-double/2-bobtail-workload/import_export.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- workunit:
-     branch: bobtail
-     clients:
-        client.0:
-           - rbd/import_export.sh
-     env:
-        RBD_CREATE_ARGS: --new-format

diff --git a/suites/upgrade/rbd-double/3-upgrade/dumpling.yaml b/suites/upgrade/rbd-double/3-upgrade/dumpling.yaml
deleted file mode 100644 (file)
index e3e332c..0000000
--- a/suites/upgrade/rbd-double/3-upgrade/dumpling.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- install.upgrade:
-     all:
-        branch: dumpling

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

diff --git a/suites/upgrade/rbd-double/4-restart/upgrade_osd_mds_mon.yaml b/suites/upgrade/rbd-double/4-restart/upgrade_osd_mds_mon.yaml
deleted file mode 100644 (file)
index dbcd013..0000000
--- a/suites/upgrade/rbd-double/4-restart/upgrade_osd_mds_mon.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-tasks:
-- ceph.restart: [osd.0, osd.1, osd.2, osd.3, mds.a, mon.a, mon.b, mon.c]

diff --git a/suites/upgrade/rbd-double/5-dumpling-workload/api.yaml b/suites/upgrade/rbd-double/5-dumpling-workload/api.yaml
deleted file mode 100644 (file)
index bbcde3e..0000000
--- a/suites/upgrade/rbd-double/5-dumpling-workload/api.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-     branch: dumpling
-     clients:
-        client.0:
-           - rbd/test_librbd.sh

diff --git a/suites/upgrade/rbd-double/5-dumpling-workload/cls.yaml b/suites/upgrade/rbd-double/5-dumpling-workload/cls.yaml
deleted file mode 100644 (file)
index c8079e3..0000000
--- a/suites/upgrade/rbd-double/5-dumpling-workload/cls.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-     branch: dumpling
-     clients:
-        client.0:
-           - cls/test_cls_rbd.sh

diff --git a/suites/upgrade/rbd-double/6-upgrade-next/next.yaml b/suites/upgrade/rbd-double/6-upgrade-next/next.yaml
deleted file mode 100644 (file)
index bb34346..0000000
--- a/suites/upgrade/rbd-double/6-upgrade-next/next.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-tasks:
-- install.upgrade:
-     all:

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

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

diff --git a/suites/upgrade/rbd-double/8-next-workload/import-export.yaml b/suites/upgrade/rbd-double/8-next-workload/import-export.yaml
deleted file mode 100644 (file)
index ae44a87..0000000
--- a/suites/upgrade/rbd-double/8-next-workload/import-export.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- workunit:
-     clients:
-        client.0:
-           - rbd/import_export.sh
-     env:
-        RBD_CREATE_ARGS: --new-format

diff --git a/suites/upgrade/rbd-double/8-next-workload/python.yaml b/suites/upgrade/rbd-double/8-next-workload/python.yaml
deleted file mode 100644 (file)
index 5c6df6e..0000000
--- a/suites/upgrade/rbd-double/8-next-workload/python.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-     clients:
-        client.0:
-           - rbd/test_librbd_python.sh

diff --git a/suites/upgrade/rbd/% b/suites/upgrade/rbd/%
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/upgrade/rbd/0-cluster/start.yaml b/suites/upgrade/rbd/0-cluster/start.yaml
deleted file mode 100644 (file)
index cd071f9..0000000
--- a/suites/upgrade/rbd/0-cluster/start.yaml
+++ /dev/null
@@ -1,14 +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:

diff --git a/suites/upgrade/rbd/1-bobtail-workload/import_export.yaml b/suites/upgrade/rbd/1-bobtail-workload/import_export.yaml
deleted file mode 100644 (file)
index 9123db8..0000000
--- a/suites/upgrade/rbd/1-bobtail-workload/import_export.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- workunit:
-     branch: bobtail
-     clients:
-        client.0:
-           - rbd/import_export.sh
-     env:
-        RBD_CREATE_ARGS: --new-format

diff --git a/suites/upgrade/rbd/2-upgrade-to-dumpling/upgrade.yaml b/suites/upgrade/rbd/2-upgrade-to-dumpling/upgrade.yaml
deleted file mode 100644 (file)
index e3e332c..0000000
--- a/suites/upgrade/rbd/2-upgrade-to-dumpling/upgrade.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- install.upgrade:
-     all:
-        branch: dumpling

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

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

diff --git a/suites/upgrade/rbd/4-dumpling-workload/api.yaml b/suites/upgrade/rbd/4-dumpling-workload/api.yaml
deleted file mode 100644 (file)
index bbcde3e..0000000
--- a/suites/upgrade/rbd/4-dumpling-workload/api.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-     branch: dumpling
-     clients:
-        client.0:
-           - rbd/test_librbd.sh

diff --git a/suites/upgrade/rbd/4-dumpling-workload/cls.yaml b/suites/upgrade/rbd/4-dumpling-workload/cls.yaml
deleted file mode 100644 (file)
index c8079e3..0000000
--- a/suites/upgrade/rbd/4-dumpling-workload/cls.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-     branch: dumpling
-     clients:
-        client.0:
-           - cls/test_cls_rbd.sh

diff --git a/suites/upgrade/rbd/4-dumpling-workload/import-export.yaml b/suites/upgrade/rbd/4-dumpling-workload/import-export.yaml
deleted file mode 100644 (file)
index 364ef25..0000000
--- a/suites/upgrade/rbd/4-dumpling-workload/import-export.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- workunit:
-     branch: dumpling
-     clients:
-        client.0:
-           - rbd/import_export.sh
-     env:
-        RBD_CREATE_ARGS: --new-format

diff --git a/suites/upgrade/rbd/4-dumpling-workload/python.yaml b/suites/upgrade/rbd/4-dumpling-workload/python.yaml
deleted file mode 100644 (file)
index 737a821..0000000
--- a/suites/upgrade/rbd/4-dumpling-workload/python.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-     branch: dumpling
-     clients:
-        client.0:
-           - rbd/test_librbd_python.sh

diff --git a/suites/upgrade/rbd/5-upgrade-to-emperor/upgrade.yaml b/suites/upgrade/rbd/5-upgrade-to-emperor/upgrade.yaml
deleted file mode 100644 (file)
index e473f31..0000000
--- a/suites/upgrade/rbd/5-upgrade-to-emperor/upgrade.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- install.upgrade:
-     all:
-        branch: emperor

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

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

diff --git a/suites/upgrade/rbd/7-emperor-workload/import_export.yaml b/suites/upgrade/rbd/7-emperor-workload/import_export.yaml
deleted file mode 100644 (file)
index e297887..0000000
--- a/suites/upgrade/rbd/7-emperor-workload/import_export.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- workunit:
-     branch: emperor
-     clients:
-        client.0:
-           - rbd/import_export.sh
-     env:
-        RBD_CREATE_ARGS: --new-format

diff --git a/suites/upgrade/rgw-double/% b/suites/upgrade/rgw-double/%
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/upgrade/rgw-double/0-cluster/start.yaml b/suites/upgrade/rgw-double/0-cluster/start.yaml
deleted file mode 100644 (file)
index 01747e4..0000000
--- a/suites/upgrade/rgw-double/0-cluster/start.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-- - mon.b
-  - mon.c
-  - osd.2
-  - osd.3
-- - client.0

diff --git a/suites/upgrade/rgw-double/1-bobtail-install/bobtail.yaml b/suites/upgrade/rgw-double/1-bobtail-install/bobtail.yaml
deleted file mode 100644 (file)
index ca81c71..0000000
--- a/suites/upgrade/rgw-double/1-bobtail-install/bobtail.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- install:
-     branch: bobtail
-- ceph:
-- rgw:

diff --git a/suites/upgrade/rgw-double/2-bobtail-workload/s3tests.yaml b/suites/upgrade/rgw-double/2-bobtail-workload/s3tests.yaml
deleted file mode 100644 (file)
index 7397ae6..0000000
--- a/suites/upgrade/rgw-double/2-bobtail-workload/s3tests.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- s3tests:
-    client.0:
-      force-branch: bobtail
-      rgw_server: client.0

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

diff --git a/suites/upgrade/rgw-double/4-restart/upgrade_mon_mds_osd.yaml b/suites/upgrade/rgw-double/4-restart/upgrade_mon_mds_osd.yaml
deleted file mode 100644 (file)
index 8666590..0000000
--- a/suites/upgrade/rgw-double/4-restart/upgrade_mon_mds_osd.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-tasks:
-- ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3, rgw.client.0]

diff --git a/suites/upgrade/rgw-double/4-restart/upgrade_osd_mds_mon.yaml b/suites/upgrade/rgw-double/4-restart/upgrade_osd_mds_mon.yaml
deleted file mode 100644 (file)
index 425cf60..0000000
--- a/suites/upgrade/rgw-double/4-restart/upgrade_osd_mds_mon.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-tasks:
-- ceph.restart: [osd.0, osd.1, osd.2, osd.3, mds.a, mon.a, mon.b, mon.c, rgw.client.0]

diff --git a/suites/upgrade/rgw-double/5-dumpling-workload/readwrite.yaml b/suites/upgrade/rgw-double/5-dumpling-workload/readwrite.yaml
deleted file mode 100644 (file)
index d3166f1..0000000
--- a/suites/upgrade/rgw-double/5-dumpling-workload/readwrite.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-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-double/5-dumpling-workload/s3tests.yaml b/suites/upgrade/rgw-double/5-dumpling-workload/s3tests.yaml
deleted file mode 100644 (file)
index 6506960..0000000
--- a/suites/upgrade/rgw-double/5-dumpling-workload/s3tests.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- s3tests:
-    client.0:
-      force-branch: dumpling
-      rgw_server: client.0

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

diff --git a/suites/upgrade/rgw-double/6-upgrade-next/next.yaml b/suites/upgrade/rgw-double/6-upgrade-next/next.yaml
deleted file mode 100644 (file)
index bb34346..0000000
--- a/suites/upgrade/rgw-double/6-upgrade-next/next.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-tasks:
-- install.upgrade:
-     all:

diff --git a/suites/upgrade/rgw-double/7-restart/mon-mds-osd.yaml b/suites/upgrade/rgw-double/7-restart/mon-mds-osd.yaml
deleted file mode 100644 (file)
index 8666590..0000000
--- a/suites/upgrade/rgw-double/7-restart/mon-mds-osd.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-tasks:
-- ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3, rgw.client.0]

diff --git a/suites/upgrade/rgw-double/7-restart/osd-mds-mon.yaml b/suites/upgrade/rgw-double/7-restart/osd-mds-mon.yaml
deleted file mode 100644 (file)
index 425cf60..0000000
--- a/suites/upgrade/rgw-double/7-restart/osd-mds-mon.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-tasks:
-- ceph.restart: [osd.0, osd.1, osd.2, osd.3, mds.a, mon.a, mon.b, mon.c, rgw.client.0]

diff --git a/suites/upgrade/rgw-double/8-next-workload/readwrite.yaml b/suites/upgrade/rgw-double/8-next-workload/readwrite.yaml
deleted file mode 100644 (file)
index d3166f1..0000000
--- a/suites/upgrade/rgw-double/8-next-workload/readwrite.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-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-double/8-next-workload/s3tests.yaml b/suites/upgrade/rgw-double/8-next-workload/s3tests.yaml
deleted file mode 100644 (file)
index 573cffb..0000000
--- a/suites/upgrade/rgw-double/8-next-workload/s3tests.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- s3tests:
-    client.0:
-      rgw_server: client.0

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

diff --git a/suites/upgrade/rgw/% b/suites/upgrade/rgw/%
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/upgrade/rgw/0-cluster/start.yaml b/suites/upgrade/rgw/0-cluster/start.yaml
deleted file mode 100644 (file)
index 8b1ebbe..0000000
--- a/suites/upgrade/rgw/0-cluster/start.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-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:
-    conf:
-      client:
-        client mount timeout: 600
-        rgw init timeout: 600
-- rgw: [client.0]

diff --git a/suites/upgrade/rgw/1-bobtail-workload/s3readwrite.yaml b/suites/upgrade/rgw/1-bobtail-workload/s3readwrite.yaml
deleted file mode 100644 (file)
index d3166f1..0000000
--- a/suites/upgrade/rgw/1-bobtail-workload/s3readwrite.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-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/1-bobtail-workload/s3tests.yaml b/suites/upgrade/rgw/1-bobtail-workload/s3tests.yaml
deleted file mode 100644 (file)
index 8020d79..0000000
--- a/suites/upgrade/rgw/1-bobtail-workload/s3tests.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- s3tests:
-    client.0:
-      rgw_server: client.0
-      force-branch: bobtail

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

diff --git a/suites/upgrade/rgw/2-upgrade-to-dumpling/upgrade.yaml b/suites/upgrade/rgw/2-upgrade-to-dumpling/upgrade.yaml
deleted file mode 100644 (file)
index e3e332c..0000000
--- a/suites/upgrade/rgw/2-upgrade-to-dumpling/upgrade.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- install.upgrade:
-     all:
-        branch: dumpling

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

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

diff --git a/suites/upgrade/rgw/4-dumpling-workload/readwrite.yaml b/suites/upgrade/rgw/4-dumpling-workload/readwrite.yaml
deleted file mode 100644 (file)
index d3166f1..0000000
--- a/suites/upgrade/rgw/4-dumpling-workload/readwrite.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-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/4-dumpling-workload/s3tests.yaml b/suites/upgrade/rgw/4-dumpling-workload/s3tests.yaml
deleted file mode 100644 (file)
index 6506960..0000000
--- a/suites/upgrade/rgw/4-dumpling-workload/s3tests.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- s3tests:
-    client.0:
-      force-branch: dumpling
-      rgw_server: client.0

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

diff --git a/suites/upgrade/rgw/5-upgrade-to-emperor/upgrade.yaml b/suites/upgrade/rgw/5-upgrade-to-emperor/upgrade.yaml
deleted file mode 100644 (file)
index e473f31..0000000
--- a/suites/upgrade/rgw/5-upgrade-to-emperor/upgrade.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- install.upgrade:
-     all:
-        branch: emperor

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

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

diff --git a/suites/upgrade/rgw/7-emperor-workload/readwrite.yaml b/suites/upgrade/rgw/7-emperor-workload/readwrite.yaml
deleted file mode 100644 (file)
index d3166f1..0000000
--- a/suites/upgrade/rgw/7-emperor-workload/readwrite.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-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/7-emperor-workload/s3tests.yaml b/suites/upgrade/rgw/7-emperor-workload/s3tests.yaml
deleted file mode 100644 (file)
index cc9675c..0000000
--- a/suites/upgrade/rgw/7-emperor-workload/s3tests.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- s3tests:
-    client.0:
-      force-branch: emperor
-      rgw_server: client.0

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