upgrade/cuttlefish, emperor, old: remove

Signed-off-by: Sage Weil <sage@redhat.com>

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

diff --git a/suites/upgrade/cuttlefish/fs/0-cluster/start.yaml b/suites/upgrade/cuttlefish/fs/0-cluster/start.yaml
deleted file mode 100644 (file)
index c1acc4e..0000000
--- a/suites/upgrade/cuttlefish/fs/0-cluster/start.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-    - scrub
-    fs: xfs
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-  - osd.2
-- - mon.b
-  - mon.c
-  - osd.3
-  - osd.4
-  - osd.5
-  - client.0

diff --git a/suites/upgrade/cuttlefish/fs/1-cuttlefish-install/bobtail.v0.61.5.yaml b/suites/upgrade/cuttlefish/fs/1-cuttlefish-install/bobtail.v0.61.5.yaml
deleted file mode 100644 (file)
index 286cdd6..0000000
--- a/suites/upgrade/cuttlefish/fs/1-cuttlefish-install/bobtail.v0.61.5.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-tasks:
-- install:
-    branch: bobtail
-- ceph:
-- install.upgrade:
-    all:
-      tag: v0.61.5
-- ceph.restart:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/cuttlefish/fs/1-cuttlefish-install/v0.61.5.yaml b/suites/upgrade/cuttlefish/fs/1-cuttlefish-install/v0.61.5.yaml
deleted file mode 100644 (file)
index 07d0431..0000000
--- a/suites/upgrade/cuttlefish/fs/1-cuttlefish-install/v0.61.5.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-    tag: v0.61.5
-- ceph:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/cuttlefish/fs/1-cuttlefish-install/v0.61.6.yaml b/suites/upgrade/cuttlefish/fs/1-cuttlefish-install/v0.61.6.yaml
deleted file mode 100644 (file)
index 9d74ab3..0000000
--- a/suites/upgrade/cuttlefish/fs/1-cuttlefish-install/v0.61.6.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-    tag: v0.61.6
-- ceph:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/cuttlefish/fs/2-workload/blogbench.yaml b/suites/upgrade/cuttlefish/fs/2-workload/blogbench.yaml
deleted file mode 100644 (file)
index 0cd59ea..0000000
--- a/suites/upgrade/cuttlefish/fs/2-workload/blogbench.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-workload:
-   workunit:
-      clients:
-         all:
-           - suites/blogbench.sh

diff --git a/suites/upgrade/cuttlefish/fs/3-upgrade-sequence/upgrade-mds-mon-osd.yaml b/suites/upgrade/cuttlefish/fs/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
deleted file mode 100644 (file)
index c97aef7..0000000
--- a/suites/upgrade/cuttlefish/fs/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: cuttlefish
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.b]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.3]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.4]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.5]

diff --git a/suites/upgrade/cuttlefish/fs/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/cuttlefish/fs/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
deleted file mode 100644 (file)
index 9d06ef3..0000000
--- a/suites/upgrade/cuttlefish/fs/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: cuttlefish
-   - ceph.restart: [mon.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.b]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.3]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.4]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.5]

diff --git a/suites/upgrade/cuttlefish/fs/3-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade/cuttlefish/fs/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
deleted file mode 100644 (file)
index dd76b10..0000000
--- a/suites/upgrade/cuttlefish/fs/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: cuttlefish
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.3]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.4]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.5]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.b]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mds.a]

diff --git a/suites/upgrade/cuttlefish/fs/4-final/monthrash.yaml b/suites/upgrade/cuttlefish/fs/4-final/monthrash.yaml
deleted file mode 100644 (file)
index 13af446..0000000
--- a/suites/upgrade/cuttlefish/fs/4-final/monthrash.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-tasks:
-- mon_thrash:
-    revive_delay: 20
-    thrash_delay: 1
-- ceph-fuse:
-- workunit:
-    clients:
-      client.0:
-        - suites/dbench.sh
-

diff --git a/suites/upgrade/cuttlefish/fs/4-final/osdthrash.yaml b/suites/upgrade/cuttlefish/fs/4-final/osdthrash.yaml
deleted file mode 100644 (file)
index dbd7191..0000000
--- a/suites/upgrade/cuttlefish/fs/4-final/osdthrash.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-    - wrongly marked me down
-    - objects unfound and apparently lost
-    - log bound mismatch
-tasks:
-- thrashosds:
-    timeout: 1200
-    chance_pgnum_grow: 1
-    chance_pgpnum_fix: 1
-- ceph-fuse:
-- workunit:
-    clients:
-      all:
-        - suites/iogen.sh
-

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

diff --git a/suites/upgrade/cuttlefish/rados-older/0-cluster/start.yaml b/suites/upgrade/cuttlefish/rados-older/0-cluster/start.yaml
deleted file mode 100644 (file)
index 8626abc..0000000
--- a/suites/upgrade/cuttlefish/rados-older/0-cluster/start.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-    - scrub
-    conf:
-      paxos service trim min: 5
-      mon min osdmap epochs: 25
-    fs: xfs
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-  - osd.2
-- - mon.b
-  - mon.c
-  - osd.3
-  - osd.4
-  - osd.5
-  - client.0

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

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

diff --git a/suites/upgrade/cuttlefish/rados-older/2-upgrade/v0.61.3.yaml b/suites/upgrade/cuttlefish/rados-older/2-upgrade/v0.61.3.yaml
deleted file mode 100644 (file)
index aca276b..0000000
--- a/suites/upgrade/cuttlefish/rados-older/2-upgrade/v0.61.3.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- install.upgrade:
-    all:
-      tag: v0.61.3
-- ceph.restart:

diff --git a/suites/upgrade/cuttlefish/rados-older/2-upgrade/v0.61.4.yaml b/suites/upgrade/cuttlefish/rados-older/2-upgrade/v0.61.4.yaml
deleted file mode 100644 (file)
index c44994e..0000000
--- a/suites/upgrade/cuttlefish/rados-older/2-upgrade/v0.61.4.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- install.upgrade:
-    all:
-      tag: v0.61.4
-- ceph.restart:

diff --git a/suites/upgrade/cuttlefish/rados-older/2-upgrade/v0.61.5.yaml b/suites/upgrade/cuttlefish/rados-older/2-upgrade/v0.61.5.yaml
deleted file mode 100644 (file)
index d46a1a1..0000000
--- a/suites/upgrade/cuttlefish/rados-older/2-upgrade/v0.61.5.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- install.upgrade:
-    all:
-      tag: v0.61.5
-- ceph.restart:

diff --git a/suites/upgrade/cuttlefish/rados-older/3-rolling-upgrade/all.yaml b/suites/upgrade/cuttlefish/rados-older/3-rolling-upgrade/all.yaml
deleted file mode 100644 (file)
index fe89235..0000000
--- a/suites/upgrade/cuttlefish/rados-older/3-rolling-upgrade/all.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/cuttlefish/rados-older/4-upgrade-sequence/upgrade-mds-mon-osd.yaml b/suites/upgrade/cuttlefish/rados-older/4-upgrade-sequence/upgrade-mds-mon-osd.yaml
deleted file mode 100644 (file)
index e70e5d0..0000000
--- a/suites/upgrade/cuttlefish/rados-older/4-upgrade-sequence/upgrade-mds-mon-osd.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: cuttlefish
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60
-   - ceph.restart:
-       daemons: [mon.a]
-       wait-for-healthy: false
-       wait-for-osds-up: true
-   - sleep:
-       duration: 60
-   - ceph.restart:
-       daemons: [mon.b]
-       wait-for-healthy: false
-       wait-for-osds-up: true
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.3]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.4]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.5]

diff --git a/suites/upgrade/cuttlefish/rados-older/4-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/cuttlefish/rados-older/4-upgrade-sequence/upgrade-mon-osd-mds.yaml
deleted file mode 100644 (file)
index ed25b70..0000000
--- a/suites/upgrade/cuttlefish/rados-older/4-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: cuttlefish
-   - ceph.restart:
-       daemons: [mon.a]
-       wait-for-healthy: false
-       wait-for-osds-up: true
-   - sleep:
-       duration: 60
-   - ceph.restart:
-       daemons: [mon.b]
-       wait-for-healthy: false
-       wait-for-osds-up: true
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.3]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.4]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.5]

diff --git a/suites/upgrade/cuttlefish/rados-older/4-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade/cuttlefish/rados-older/4-upgrade-sequence/upgrade-osd-mon-mds.yaml
deleted file mode 100644 (file)
index 33368cd..0000000
--- a/suites/upgrade/cuttlefish/rados-older/4-upgrade-sequence/upgrade-osd-mon-mds.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: cuttlefish
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.3]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.4]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.5]
-   - sleep:
-       duration: 60
-   - ceph.restart:
-       daemons: [mon.a]
-       wait-for-healthy: false
-       wait-for-osds-up: true
-   - sleep:
-       duration: 60
-   - ceph.restart:
-       daemons: [mon.b]
-       wait-for-healthy: false
-       wait-for-osds-up: true
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60

diff --git a/suites/upgrade/cuttlefish/rados-older/5-workload/testrados.yaml b/suites/upgrade/cuttlefish/rados-older/5-workload/testrados.yaml
deleted file mode 100644 (file)
index 49339ec..0000000
--- a/suites/upgrade/cuttlefish/rados-older/5-workload/testrados.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-workload:
-  rados:
-    clients: [client.0]
-    ops: 2000
-    objects: 50
-    op_weights:
-      read: 100
-      write: 100
-      delete: 50
-      snap_create: 50
-      snap_remove: 50
-      rollback: 50

diff --git a/suites/upgrade/cuttlefish/rados-older/6-final/monthrash.yaml b/suites/upgrade/cuttlefish/rados-older/6-final/monthrash.yaml
deleted file mode 100644 (file)
index 810ba1b..0000000
--- a/suites/upgrade/cuttlefish/rados-older/6-final/monthrash.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-tasks:
-- mon_thrash:
-    revive_delay: 20
-    thrash_delay: 1
-- workunit:
-    clients:
-      client.0:
-        - rados/test.sh
-

diff --git a/suites/upgrade/cuttlefish/rados-older/6-final/osdthrash.yaml b/suites/upgrade/cuttlefish/rados-older/6-final/osdthrash.yaml
deleted file mode 100644 (file)
index f815042..0000000
--- a/suites/upgrade/cuttlefish/rados-older/6-final/osdthrash.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-    - wrongly marked me down
-    - objects unfound and apparently lost
-    - log bound mismatch
-tasks:
-- thrashosds:
-    timeout: 1200
-    chance_pgnum_grow: 1
-    chance_pgpnum_fix: 1
-- rados:
-    clients: [client.0]
-    ops: 2000
-    objects: 50
-    op_weights:
-      read: 100
-      write: 100
-      delete: 50
-      snap_create: 50
-      snap_remove: 50
-      rollback: 50
-

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

diff --git a/suites/upgrade/cuttlefish/rados/0-cluster/start.yaml b/suites/upgrade/cuttlefish/rados/0-cluster/start.yaml
deleted file mode 100644 (file)
index c1acc4e..0000000
--- a/suites/upgrade/cuttlefish/rados/0-cluster/start.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-    - scrub
-    fs: xfs
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-  - osd.2
-- - mon.b
-  - mon.c
-  - osd.3
-  - osd.4
-  - osd.5
-  - client.0

diff --git a/suites/upgrade/cuttlefish/rados/1-cuttlefish-install/bobtail.v0.61.5.yaml b/suites/upgrade/cuttlefish/rados/1-cuttlefish-install/bobtail.v0.61.5.yaml
deleted file mode 100644 (file)
index 286cdd6..0000000
--- a/suites/upgrade/cuttlefish/rados/1-cuttlefish-install/bobtail.v0.61.5.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-tasks:
-- install:
-    branch: bobtail
-- ceph:
-- install.upgrade:
-    all:
-      tag: v0.61.5
-- ceph.restart:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/cuttlefish/rados/1-cuttlefish-install/v0.61.5.yaml b/suites/upgrade/cuttlefish/rados/1-cuttlefish-install/v0.61.5.yaml
deleted file mode 100644 (file)
index 07d0431..0000000
--- a/suites/upgrade/cuttlefish/rados/1-cuttlefish-install/v0.61.5.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-    tag: v0.61.5
-- ceph:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/cuttlefish/rados/1-cuttlefish-install/v0.61.6.yaml b/suites/upgrade/cuttlefish/rados/1-cuttlefish-install/v0.61.6.yaml
deleted file mode 100644 (file)
index 9d74ab3..0000000
--- a/suites/upgrade/cuttlefish/rados/1-cuttlefish-install/v0.61.6.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-    tag: v0.61.6
-- ceph:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/cuttlefish/rados/2-workload/testrados.yaml b/suites/upgrade/cuttlefish/rados/2-workload/testrados.yaml
deleted file mode 100644 (file)
index 8eaab19..0000000
--- a/suites/upgrade/cuttlefish/rados/2-workload/testrados.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-workload:
-  rados:
-    clients: [client.0]
-    ops: 2000
-    objects: 50
-    op_weights:
-      read: 100
-      write: 100
-      delete: 50
-      snap_create: 50
-      snap_remove: 50
-      rollback: 50
-

diff --git a/suites/upgrade/cuttlefish/rados/3-upgrade-sequence/upgrade-mds-mon-osd.yaml b/suites/upgrade/cuttlefish/rados/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
deleted file mode 100644 (file)
index c97aef7..0000000
--- a/suites/upgrade/cuttlefish/rados/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: cuttlefish
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.b]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.3]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.4]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.5]

diff --git a/suites/upgrade/cuttlefish/rados/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/cuttlefish/rados/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
deleted file mode 100644 (file)
index 9d06ef3..0000000
--- a/suites/upgrade/cuttlefish/rados/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: cuttlefish
-   - ceph.restart: [mon.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.b]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.3]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.4]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.5]

diff --git a/suites/upgrade/cuttlefish/rados/3-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade/cuttlefish/rados/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
deleted file mode 100644 (file)
index c061399..0000000
--- a/suites/upgrade/cuttlefish/rados/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: cuttlefish
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.3]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.4]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.5]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.b]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60

diff --git a/suites/upgrade/cuttlefish/rados/4-final/monthrash.yaml b/suites/upgrade/cuttlefish/rados/4-final/monthrash.yaml
deleted file mode 100644 (file)
index 810ba1b..0000000
--- a/suites/upgrade/cuttlefish/rados/4-final/monthrash.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-tasks:
-- mon_thrash:
-    revive_delay: 20
-    thrash_delay: 1
-- workunit:
-    clients:
-      client.0:
-        - rados/test.sh
-

diff --git a/suites/upgrade/cuttlefish/rados/4-final/osdthrash.yaml b/suites/upgrade/cuttlefish/rados/4-final/osdthrash.yaml
deleted file mode 100644 (file)
index f815042..0000000
--- a/suites/upgrade/cuttlefish/rados/4-final/osdthrash.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-    - wrongly marked me down
-    - objects unfound and apparently lost
-    - log bound mismatch
-tasks:
-- thrashosds:
-    timeout: 1200
-    chance_pgnum_grow: 1
-    chance_pgpnum_fix: 1
-- rados:
-    clients: [client.0]
-    ops: 2000
-    objects: 50
-    op_weights:
-      read: 100
-      write: 100
-      delete: 50
-      snap_create: 50
-      snap_remove: 50
-      rollback: 50
-

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

diff --git a/suites/upgrade/cuttlefish/rbd/0-cluster/start.yaml b/suites/upgrade/cuttlefish/rbd/0-cluster/start.yaml
deleted file mode 100644 (file)
index c1acc4e..0000000
--- a/suites/upgrade/cuttlefish/rbd/0-cluster/start.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-    - scrub
-    fs: xfs
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-  - osd.2
-- - mon.b
-  - mon.c
-  - osd.3
-  - osd.4
-  - osd.5
-  - client.0

diff --git a/suites/upgrade/cuttlefish/rbd/1-cuttlefish-install/bobtail.v0.61.5.yaml b/suites/upgrade/cuttlefish/rbd/1-cuttlefish-install/bobtail.v0.61.5.yaml
deleted file mode 100644 (file)
index 286cdd6..0000000
--- a/suites/upgrade/cuttlefish/rbd/1-cuttlefish-install/bobtail.v0.61.5.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-tasks:
-- install:
-    branch: bobtail
-- ceph:
-- install.upgrade:
-    all:
-      tag: v0.61.5
-- ceph.restart:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/cuttlefish/rbd/1-cuttlefish-install/v0.61.5.yaml b/suites/upgrade/cuttlefish/rbd/1-cuttlefish-install/v0.61.5.yaml
deleted file mode 100644 (file)
index 07d0431..0000000
--- a/suites/upgrade/cuttlefish/rbd/1-cuttlefish-install/v0.61.5.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-    tag: v0.61.5
-- ceph:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/cuttlefish/rbd/1-cuttlefish-install/v0.61.6.yaml b/suites/upgrade/cuttlefish/rbd/1-cuttlefish-install/v0.61.6.yaml
deleted file mode 100644 (file)
index 9d74ab3..0000000
--- a/suites/upgrade/cuttlefish/rbd/1-cuttlefish-install/v0.61.6.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-    tag: v0.61.6
-- ceph:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/cuttlefish/rbd/2-workload/rbd.yaml b/suites/upgrade/cuttlefish/rbd/2-workload/rbd.yaml
deleted file mode 100644 (file)
index ce2fabe..0000000
--- a/suites/upgrade/cuttlefish/rbd/2-workload/rbd.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-workload:
-   sequential:
-   - workunit:
-       clients:
-         client.0:
-           - rbd/import_export.sh
-       env:
-         RBD_CREATE_ARGS: --new-format
-   - workunit:
-       clients:
-         client.0:
-           - cls/test_cls_rbd.sh
- 
-

diff --git a/suites/upgrade/cuttlefish/rbd/3-upgrade-sequence/upgrade-mds-mon-osd.yaml b/suites/upgrade/cuttlefish/rbd/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
deleted file mode 100644 (file)
index c97aef7..0000000
--- a/suites/upgrade/cuttlefish/rbd/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: cuttlefish
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.b]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.3]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.4]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.5]

diff --git a/suites/upgrade/cuttlefish/rbd/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/cuttlefish/rbd/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
deleted file mode 100644 (file)
index 9d06ef3..0000000
--- a/suites/upgrade/cuttlefish/rbd/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: cuttlefish
-   - ceph.restart: [mon.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.b]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.3]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.4]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.5]

diff --git a/suites/upgrade/cuttlefish/rbd/3-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade/cuttlefish/rbd/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
deleted file mode 100644 (file)
index dd76b10..0000000
--- a/suites/upgrade/cuttlefish/rbd/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: cuttlefish
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.3]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.4]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.5]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.b]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mds.a]

diff --git a/suites/upgrade/cuttlefish/rbd/4-final/monthrash.yaml b/suites/upgrade/cuttlefish/rbd/4-final/monthrash.yaml
deleted file mode 100644 (file)
index 593191c..0000000
--- a/suites/upgrade/cuttlefish/rbd/4-final/monthrash.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-tasks:
-- mon_thrash:
-    revive_delay: 20
-    thrash_delay: 1
-- workunit:
-    clients:
-      client.0:
-        - rbd/copy.sh
-    env:
-      RBD_CREATE_ARGS: --new-format
-

diff --git a/suites/upgrade/cuttlefish/rbd/4-final/osdthrash.yaml b/suites/upgrade/cuttlefish/rbd/4-final/osdthrash.yaml
deleted file mode 100644 (file)
index 575fd79..0000000
--- a/suites/upgrade/cuttlefish/rbd/4-final/osdthrash.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-    - wrongly marked me down
-    - objects unfound and apparently lost
-    - log bound mismatch
-tasks:
-- thrashosds:
-    timeout: 1200
-    chance_pgnum_grow: 1
-    chance_pgpnum_fix: 1
-- workunit:
-    clients:
-      client.0:
-        - rbd/test_lock_fence.sh
-

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

diff --git a/suites/upgrade/cuttlefish/rgw/0-cluster/start.yaml b/suites/upgrade/cuttlefish/rgw/0-cluster/start.yaml
deleted file mode 100644 (file)
index c1acc4e..0000000
--- a/suites/upgrade/cuttlefish/rgw/0-cluster/start.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-    - scrub
-    fs: xfs
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-  - osd.2
-- - mon.b
-  - mon.c
-  - osd.3
-  - osd.4
-  - osd.5
-  - client.0

diff --git a/suites/upgrade/cuttlefish/rgw/1-cuttlefish-install/bobtail.v0.61.5.yaml b/suites/upgrade/cuttlefish/rgw/1-cuttlefish-install/bobtail.v0.61.5.yaml
deleted file mode 100644 (file)
index 286cdd6..0000000
--- a/suites/upgrade/cuttlefish/rgw/1-cuttlefish-install/bobtail.v0.61.5.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-tasks:
-- install:
-    branch: bobtail
-- ceph:
-- install.upgrade:
-    all:
-      tag: v0.61.5
-- ceph.restart:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/cuttlefish/rgw/1-cuttlefish-install/v0.61.5.yaml b/suites/upgrade/cuttlefish/rgw/1-cuttlefish-install/v0.61.5.yaml
deleted file mode 100644 (file)
index 07d0431..0000000
--- a/suites/upgrade/cuttlefish/rgw/1-cuttlefish-install/v0.61.5.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-    tag: v0.61.5
-- ceph:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/cuttlefish/rgw/1-cuttlefish-install/v0.61.6.yaml b/suites/upgrade/cuttlefish/rgw/1-cuttlefish-install/v0.61.6.yaml
deleted file mode 100644 (file)
index 9d74ab3..0000000
--- a/suites/upgrade/cuttlefish/rgw/1-cuttlefish-install/v0.61.6.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-    tag: v0.61.6
-- ceph:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/cuttlefish/rgw/2-workload/testrgw.yaml b/suites/upgrade/cuttlefish/rgw/2-workload/testrgw.yaml
deleted file mode 100644 (file)
index f1b2f3e..0000000
--- a/suites/upgrade/cuttlefish/rgw/2-workload/testrgw.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-workload:
-   rgw: [client.0]
-   s3tests:
-      client.0:
-         rgw_server: client.0
-

diff --git a/suites/upgrade/cuttlefish/rgw/3-upgrade-sequence/upgrade-mds-mon-osd.yaml b/suites/upgrade/cuttlefish/rgw/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
deleted file mode 100644 (file)
index 0de4f18..0000000
--- a/suites/upgrade/cuttlefish/rgw/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: cuttlefish
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.b]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.3]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.4]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.5]
-   - sleep:
-       duration: 30
-   - ceph.restart: [rgw.client.0]

diff --git a/suites/upgrade/cuttlefish/rgw/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/cuttlefish/rgw/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
deleted file mode 100644 (file)
index c7fa40f..0000000
--- a/suites/upgrade/cuttlefish/rgw/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: cuttlefish
-   - ceph.restart: [mon.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.b]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.3]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.4]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.5]
-   - sleep:
-       duration: 30
-   - ceph.restart: [rgw.client.0]

diff --git a/suites/upgrade/cuttlefish/rgw/3-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade/cuttlefish/rgw/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
deleted file mode 100644 (file)
index 0d0639e..0000000
--- a/suites/upgrade/cuttlefish/rgw/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: cuttlefish
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.3]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.4]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.5]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.b]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [rgw.client.0]

diff --git a/suites/upgrade/cuttlefish/rgw/4-final/monthrash.yaml b/suites/upgrade/cuttlefish/rgw/4-final/monthrash.yaml
deleted file mode 100644 (file)
index 9361edc..0000000
--- a/suites/upgrade/cuttlefish/rgw/4-final/monthrash.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- mon_thrash:
-    revive_delay: 20
-    thrash_delay: 1
-- swift:
-    client.0:
-      rgw_server: client.0
-

diff --git a/suites/upgrade/cuttlefish/rgw/4-final/osdthrash.yaml b/suites/upgrade/cuttlefish/rgw/4-final/osdthrash.yaml
deleted file mode 100644 (file)
index 6cf6d86..0000000
--- a/suites/upgrade/cuttlefish/rgw/4-final/osdthrash.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-    - wrongly marked me down
-    - objects unfound and apparently lost
-    - log bound mismatch
-tasks:
-- thrashosds:
-    timeout: 1200
-    chance_pgnum_grow: 1
-    chance_pgpnum_fix: 1
-- swift:
-    client.0:
-      rgw_server: client.0
-

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

diff --git a/suites/upgrade/emperor/fs/0-cluster/start.yaml b/suites/upgrade/emperor/fs/0-cluster/start.yaml
deleted file mode 100644 (file)
index c1acc4e..0000000
--- a/suites/upgrade/emperor/fs/0-cluster/start.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-    - scrub
-    fs: xfs
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-  - osd.2
-- - mon.b
-  - mon.c
-  - osd.3
-  - osd.4
-  - osd.5
-  - client.0

diff --git a/suites/upgrade/emperor/fs/1-emperor-install/dumpling.v0.67.5.yaml b/suites/upgrade/emperor/fs/1-emperor-install/dumpling.v0.67.5.yaml
deleted file mode 100644 (file)
index a2891c4..0000000
--- a/suites/upgrade/emperor/fs/1-emperor-install/dumpling.v0.67.5.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-tasks:
-- install:
-    branch: dumpling
-- ceph:
-- install.upgrade:
-    all:
-      tag: 
-- ceph.restart:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/emperor/fs/1-emperor-install/v0.73.yaml b/suites/upgrade/emperor/fs/1-emperor-install/v0.73.yaml
deleted file mode 100644 (file)
index 7750040..0000000
--- a/suites/upgrade/emperor/fs/1-emperor-install/v0.73.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-    tag: v0.73
-- ceph:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/emperor/fs/1-emperor-install/v0.74.yaml b/suites/upgrade/emperor/fs/1-emperor-install/v0.74.yaml
deleted file mode 100644 (file)
index 9d0ded4..0000000
--- a/suites/upgrade/emperor/fs/1-emperor-install/v0.74.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-    tag: v0.74
-- ceph:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/emperor/fs/1-emperor-install/v0.75.yaml b/suites/upgrade/emperor/fs/1-emperor-install/v0.75.yaml
deleted file mode 100644 (file)
index 368f0ec..0000000
--- a/suites/upgrade/emperor/fs/1-emperor-install/v0.75.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-    tag: v0.75
-- ceph:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/emperor/fs/2-workload/blogbench.yaml b/suites/upgrade/emperor/fs/2-workload/blogbench.yaml
deleted file mode 100644 (file)
index 0cd59ea..0000000
--- a/suites/upgrade/emperor/fs/2-workload/blogbench.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-workload:
-   workunit:
-      clients:
-         all:
-           - suites/blogbench.sh

diff --git a/suites/upgrade/emperor/fs/3-upgrade-sequence/upgrade-mds-mon-osd.yaml b/suites/upgrade/emperor/fs/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
deleted file mode 100644 (file)
index 520dc4b..0000000
--- a/suites/upgrade/emperor/fs/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: emperor
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.b]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.3]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.4]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.5]

diff --git a/suites/upgrade/emperor/fs/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/emperor/fs/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
deleted file mode 100644 (file)
index e11f8c3..0000000
--- a/suites/upgrade/emperor/fs/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: emperor
-   - ceph.restart: [mon.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.b]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.3]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.4]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.5]

diff --git a/suites/upgrade/emperor/fs/3-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade/emperor/fs/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
deleted file mode 100644 (file)
index 78cb33b..0000000
--- a/suites/upgrade/emperor/fs/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: emperor
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.3]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.4]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.5]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.b]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mds.a]

diff --git a/suites/upgrade/emperor/fs/4-final/monthrash.yaml b/suites/upgrade/emperor/fs/4-final/monthrash.yaml
deleted file mode 100644 (file)
index 13af446..0000000
--- a/suites/upgrade/emperor/fs/4-final/monthrash.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-tasks:
-- mon_thrash:
-    revive_delay: 20
-    thrash_delay: 1
-- ceph-fuse:
-- workunit:
-    clients:
-      client.0:
-        - suites/dbench.sh
-

diff --git a/suites/upgrade/emperor/fs/4-final/osdthrash.yaml b/suites/upgrade/emperor/fs/4-final/osdthrash.yaml
deleted file mode 100644 (file)
index dbd7191..0000000
--- a/suites/upgrade/emperor/fs/4-final/osdthrash.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-    - wrongly marked me down
-    - objects unfound and apparently lost
-    - log bound mismatch
-tasks:
-- thrashosds:
-    timeout: 1200
-    chance_pgnum_grow: 1
-    chance_pgpnum_fix: 1
-- ceph-fuse:
-- workunit:
-    clients:
-      all:
-        - suites/iogen.sh
-

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

diff --git a/suites/upgrade/emperor/rados/0-cluster/start.yaml b/suites/upgrade/emperor/rados/0-cluster/start.yaml
deleted file mode 100644 (file)
index c1acc4e..0000000
--- a/suites/upgrade/emperor/rados/0-cluster/start.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-    - scrub
-    fs: xfs
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-  - osd.2
-- - mon.b
-  - mon.c
-  - osd.3
-  - osd.4
-  - osd.5
-  - client.0

diff --git a/suites/upgrade/emperor/rados/1-emperor-install/dumpling.v0.67.5.yaml b/suites/upgrade/emperor/rados/1-emperor-install/dumpling.v0.67.5.yaml
deleted file mode 100644 (file)
index a2891c4..0000000
--- a/suites/upgrade/emperor/rados/1-emperor-install/dumpling.v0.67.5.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-tasks:
-- install:
-    branch: dumpling
-- ceph:
-- install.upgrade:
-    all:
-      tag: 
-- ceph.restart:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/emperor/rados/1-emperor-install/v0.73.yaml b/suites/upgrade/emperor/rados/1-emperor-install/v0.73.yaml
deleted file mode 100644 (file)
index 7750040..0000000
--- a/suites/upgrade/emperor/rados/1-emperor-install/v0.73.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-    tag: v0.73
-- ceph:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/emperor/rados/1-emperor-install/v0.74.yaml b/suites/upgrade/emperor/rados/1-emperor-install/v0.74.yaml
deleted file mode 100644 (file)
index 9d0ded4..0000000
--- a/suites/upgrade/emperor/rados/1-emperor-install/v0.74.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-    tag: v0.74
-- ceph:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/emperor/rados/1-emperor-install/v0.75.yaml b/suites/upgrade/emperor/rados/1-emperor-install/v0.75.yaml
deleted file mode 100644 (file)
index 368f0ec..0000000
--- a/suites/upgrade/emperor/rados/1-emperor-install/v0.75.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-    tag: v0.75
-- ceph:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/emperor/rados/2-workload/testrados.yaml b/suites/upgrade/emperor/rados/2-workload/testrados.yaml
deleted file mode 100644 (file)
index 8eaab19..0000000
--- a/suites/upgrade/emperor/rados/2-workload/testrados.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-workload:
-  rados:
-    clients: [client.0]
-    ops: 2000
-    objects: 50
-    op_weights:
-      read: 100
-      write: 100
-      delete: 50
-      snap_create: 50
-      snap_remove: 50
-      rollback: 50
-

diff --git a/suites/upgrade/emperor/rados/3-upgrade-sequence/upgrade-mds-mon-osd.yaml b/suites/upgrade/emperor/rados/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
deleted file mode 100644 (file)
index 520dc4b..0000000
--- a/suites/upgrade/emperor/rados/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: emperor
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.b]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.3]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.4]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.5]

diff --git a/suites/upgrade/emperor/rados/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/emperor/rados/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
deleted file mode 100644 (file)
index e11f8c3..0000000
--- a/suites/upgrade/emperor/rados/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: emperor
-   - ceph.restart: [mon.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.b]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.3]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.4]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.5]

diff --git a/suites/upgrade/emperor/rados/3-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade/emperor/rados/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
deleted file mode 100644 (file)
index f0fa4b8..0000000
--- a/suites/upgrade/emperor/rados/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: emperor
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.3]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.4]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.5]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.b]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60

diff --git a/suites/upgrade/emperor/rados/4-final/monthrash.yaml b/suites/upgrade/emperor/rados/4-final/monthrash.yaml
deleted file mode 100644 (file)
index 810ba1b..0000000
--- a/suites/upgrade/emperor/rados/4-final/monthrash.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-tasks:
-- mon_thrash:
-    revive_delay: 20
-    thrash_delay: 1
-- workunit:
-    clients:
-      client.0:
-        - rados/test.sh
-

diff --git a/suites/upgrade/emperor/rados/4-final/osdthrash.yaml b/suites/upgrade/emperor/rados/4-final/osdthrash.yaml
deleted file mode 100644 (file)
index f815042..0000000
--- a/suites/upgrade/emperor/rados/4-final/osdthrash.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-    - wrongly marked me down
-    - objects unfound and apparently lost
-    - log bound mismatch
-tasks:
-- thrashosds:
-    timeout: 1200
-    chance_pgnum_grow: 1
-    chance_pgpnum_fix: 1
-- rados:
-    clients: [client.0]
-    ops: 2000
-    objects: 50
-    op_weights:
-      read: 100
-      write: 100
-      delete: 50
-      snap_create: 50
-      snap_remove: 50
-      rollback: 50
-

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

diff --git a/suites/upgrade/emperor/rbd/0-cluster/start.yaml b/suites/upgrade/emperor/rbd/0-cluster/start.yaml
deleted file mode 100644 (file)
index c1acc4e..0000000
--- a/suites/upgrade/emperor/rbd/0-cluster/start.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-    - scrub
-    fs: xfs
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-  - osd.2
-- - mon.b
-  - mon.c
-  - osd.3
-  - osd.4
-  - osd.5
-  - client.0

diff --git a/suites/upgrade/emperor/rbd/1-emperor-install/dumpling.v0.67.5.yaml b/suites/upgrade/emperor/rbd/1-emperor-install/dumpling.v0.67.5.yaml
deleted file mode 100644 (file)
index a2891c4..0000000
--- a/suites/upgrade/emperor/rbd/1-emperor-install/dumpling.v0.67.5.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-tasks:
-- install:
-    branch: dumpling
-- ceph:
-- install.upgrade:
-    all:
-      tag: 
-- ceph.restart:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/emperor/rbd/1-emperor-install/v0.73.yaml b/suites/upgrade/emperor/rbd/1-emperor-install/v0.73.yaml
deleted file mode 100644 (file)
index 7750040..0000000
--- a/suites/upgrade/emperor/rbd/1-emperor-install/v0.73.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-    tag: v0.73
-- ceph:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/emperor/rbd/1-emperor-install/v0.74.yaml b/suites/upgrade/emperor/rbd/1-emperor-install/v0.74.yaml
deleted file mode 100644 (file)
index 9d0ded4..0000000
--- a/suites/upgrade/emperor/rbd/1-emperor-install/v0.74.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-    tag: v0.74
-- ceph:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/emperor/rbd/1-emperor-install/v0.75.yaml b/suites/upgrade/emperor/rbd/1-emperor-install/v0.75.yaml
deleted file mode 100644 (file)
index 368f0ec..0000000
--- a/suites/upgrade/emperor/rbd/1-emperor-install/v0.75.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-    tag: v0.75
-- ceph:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/emperor/rbd/2-workload/rbd.yaml b/suites/upgrade/emperor/rbd/2-workload/rbd.yaml
deleted file mode 100644 (file)
index ce2fabe..0000000
--- a/suites/upgrade/emperor/rbd/2-workload/rbd.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-workload:
-   sequential:
-   - workunit:
-       clients:
-         client.0:
-           - rbd/import_export.sh
-       env:
-         RBD_CREATE_ARGS: --new-format
-   - workunit:
-       clients:
-         client.0:
-           - cls/test_cls_rbd.sh
- 
-

diff --git a/suites/upgrade/emperor/rbd/3-upgrade-sequence/upgrade-mds-mon-osd.yaml b/suites/upgrade/emperor/rbd/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
deleted file mode 100644 (file)
index 520dc4b..0000000
--- a/suites/upgrade/emperor/rbd/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: emperor
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.b]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.3]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.4]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.5]

diff --git a/suites/upgrade/emperor/rbd/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/emperor/rbd/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
deleted file mode 100644 (file)
index e11f8c3..0000000
--- a/suites/upgrade/emperor/rbd/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: emperor
-   - ceph.restart: [mon.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.b]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.3]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.4]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.5]

diff --git a/suites/upgrade/emperor/rbd/3-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade/emperor/rbd/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
deleted file mode 100644 (file)
index 78cb33b..0000000
--- a/suites/upgrade/emperor/rbd/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: emperor
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.3]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.4]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.5]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.b]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mds.a]

diff --git a/suites/upgrade/emperor/rbd/4-final/monthrash.yaml b/suites/upgrade/emperor/rbd/4-final/monthrash.yaml
deleted file mode 100644 (file)
index 593191c..0000000
--- a/suites/upgrade/emperor/rbd/4-final/monthrash.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-tasks:
-- mon_thrash:
-    revive_delay: 20
-    thrash_delay: 1
-- workunit:
-    clients:
-      client.0:
-        - rbd/copy.sh
-    env:
-      RBD_CREATE_ARGS: --new-format
-

diff --git a/suites/upgrade/emperor/rbd/4-final/osdthrash.yaml b/suites/upgrade/emperor/rbd/4-final/osdthrash.yaml
deleted file mode 100644 (file)
index 575fd79..0000000
--- a/suites/upgrade/emperor/rbd/4-final/osdthrash.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-    - wrongly marked me down
-    - objects unfound and apparently lost
-    - log bound mismatch
-tasks:
-- thrashosds:
-    timeout: 1200
-    chance_pgnum_grow: 1
-    chance_pgpnum_fix: 1
-- workunit:
-    clients:
-      client.0:
-        - rbd/test_lock_fence.sh
-

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

diff --git a/suites/upgrade/emperor/rgw/0-cluster/start.yaml b/suites/upgrade/emperor/rgw/0-cluster/start.yaml
deleted file mode 100644 (file)
index c1acc4e..0000000
--- a/suites/upgrade/emperor/rgw/0-cluster/start.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-    - scrub
-    fs: xfs
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-  - osd.2
-- - mon.b
-  - mon.c
-  - osd.3
-  - osd.4
-  - osd.5
-  - client.0

diff --git a/suites/upgrade/emperor/rgw/1-emperor-install/dumpling.v0.67.5.yaml b/suites/upgrade/emperor/rgw/1-emperor-install/dumpling.v0.67.5.yaml
deleted file mode 100644 (file)
index a2891c4..0000000
--- a/suites/upgrade/emperor/rgw/1-emperor-install/dumpling.v0.67.5.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-tasks:
-- install:
-    branch: dumpling
-- ceph:
-- install.upgrade:
-    all:
-      tag: 
-- ceph.restart:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/emperor/rgw/1-emperor-install/v0.73.yaml b/suites/upgrade/emperor/rgw/1-emperor-install/v0.73.yaml
deleted file mode 100644 (file)
index 7750040..0000000
--- a/suites/upgrade/emperor/rgw/1-emperor-install/v0.73.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-    tag: v0.73
-- ceph:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/emperor/rgw/1-emperor-install/v0.74.yaml b/suites/upgrade/emperor/rgw/1-emperor-install/v0.74.yaml
deleted file mode 100644 (file)
index 9d0ded4..0000000
--- a/suites/upgrade/emperor/rgw/1-emperor-install/v0.74.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-    tag: v0.74
-- ceph:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/emperor/rgw/1-emperor-install/v0.75.yaml b/suites/upgrade/emperor/rgw/1-emperor-install/v0.75.yaml
deleted file mode 100644 (file)
index 368f0ec..0000000
--- a/suites/upgrade/emperor/rgw/1-emperor-install/v0.75.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-    tag: v0.75
-- ceph:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/emperor/rgw/2-workload/testrgw.yaml b/suites/upgrade/emperor/rgw/2-workload/testrgw.yaml
deleted file mode 100644 (file)
index f1b2f3e..0000000
--- a/suites/upgrade/emperor/rgw/2-workload/testrgw.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-workload:
-   rgw: [client.0]
-   s3tests:
-      client.0:
-         rgw_server: client.0
-

diff --git a/suites/upgrade/emperor/rgw/3-upgrade-sequence/upgrade-mds-mon-osd.yaml b/suites/upgrade/emperor/rgw/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
deleted file mode 100644 (file)
index 0ae6f92..0000000
--- a/suites/upgrade/emperor/rgw/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: emperor
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.b]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.3]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.4]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.5]
-   - sleep:
-       duration: 30
-   - ceph.restart: [rgw.client.0]

diff --git a/suites/upgrade/emperor/rgw/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/emperor/rgw/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
deleted file mode 100644 (file)
index 3f0aad2..0000000
--- a/suites/upgrade/emperor/rgw/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: emperor
-   - ceph.restart: [mon.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.b]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.3]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.4]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.5]
-   - sleep:
-       duration: 30
-   - ceph.restart: [rgw.client.0]

diff --git a/suites/upgrade/emperor/rgw/3-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade/emperor/rgw/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
deleted file mode 100644 (file)
index 622b02d..0000000
--- a/suites/upgrade/emperor/rgw/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: emperor
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.3]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.4]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.5]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.b]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [rgw.client.0]

diff --git a/suites/upgrade/emperor/rgw/4-final/monthrash.yaml b/suites/upgrade/emperor/rgw/4-final/monthrash.yaml
deleted file mode 100644 (file)
index 9361edc..0000000
--- a/suites/upgrade/emperor/rgw/4-final/monthrash.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- mon_thrash:
-    revive_delay: 20
-    thrash_delay: 1
-- swift:
-    client.0:
-      rgw_server: client.0
-

diff --git a/suites/upgrade/emperor/rgw/4-final/osdthrash.yaml b/suites/upgrade/emperor/rgw/4-final/osdthrash.yaml
deleted file mode 100644 (file)
index 6cf6d86..0000000
--- a/suites/upgrade/emperor/rgw/4-final/osdthrash.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-    - wrongly marked me down
-    - objects unfound and apparently lost
-    - log bound mismatch
-tasks:
-- thrashosds:
-    timeout: 1200
-    chance_pgnum_grow: 1
-    chance_pgpnum_fix: 1
-- swift:
-    client.0:
-      rgw_server: client.0
-

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

diff --git a/suites/upgrade/old/fs/fs/0-cluster/start.yaml b/suites/upgrade/old/fs/fs/0-cluster/start.yaml
deleted file mode 100644 (file)
index 01747e4..0000000
--- a/suites/upgrade/old/fs/fs/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/old/fs/fs/1-cuttlefish-install/cuttlefish.yaml b/suites/upgrade/old/fs/fs/1-cuttlefish-install/cuttlefish.yaml
deleted file mode 100644 (file)
index e427343..0000000
--- a/suites/upgrade/old/fs/fs/1-cuttlefish-install/cuttlefish.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- install:
-     branch: cuttlefish
-- ceph:
-    fs: xfs
-- ceph-fuse:

diff --git a/suites/upgrade/old/fs/fs/2-cuttlefish-workload/blogbench.yaml b/suites/upgrade/old/fs/fs/2-cuttlefish-workload/blogbench.yaml
deleted file mode 100644 (file)
index 50161b0..0000000
--- a/suites/upgrade/old/fs/fs/2-cuttlefish-workload/blogbench.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-     branch: cuttlefish
-     clients:
-        client.0:
-           - suites/blogbench.sh

diff --git a/suites/upgrade/old/fs/fs/2-cuttlefish-workload/dbench.yaml b/suites/upgrade/old/fs/fs/2-cuttlefish-workload/dbench.yaml
deleted file mode 100644 (file)
index 3bb9040..0000000
--- a/suites/upgrade/old/fs/fs/2-cuttlefish-workload/dbench.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-     branch: cuttlefish
-     clients:
-        all:
-           - suites/dbench.sh

diff --git a/suites/upgrade/old/fs/fs/2-cuttlefish-workload/iogen.yaml b/suites/upgrade/old/fs/fs/2-cuttlefish-workload/iogen.yaml
deleted file mode 100644 (file)
index c832d2f..0000000
--- a/suites/upgrade/old/fs/fs/2-cuttlefish-workload/iogen.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-     branch: cuttlefish
-     clients:
-        client.0:
-           - suites/iogen.sh

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

diff --git a/suites/upgrade/old/fs/fs/4-restart/mds-mon-osd.yaml b/suites/upgrade/old/fs/fs/4-restart/mds-mon-osd.yaml
deleted file mode 100644 (file)
index d218006..0000000
--- a/suites/upgrade/old/fs/fs/4-restart/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/old/fs/fs/4-restart/mon-mds-osd.yaml b/suites/upgrade/old/fs/fs/4-restart/mon-mds-osd.yaml
deleted file mode 100644 (file)
index 78e14e9..0000000
--- a/suites/upgrade/old/fs/fs/4-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/old/fs/fs/4-restart/osd-mds-mon.yaml b/suites/upgrade/old/fs/fs/4-restart/osd-mds-mon.yaml
deleted file mode 100644 (file)
index dbcd013..0000000
--- a/suites/upgrade/old/fs/fs/4-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/old/fs/fs/5-dumpling-workload/fsstress.yaml b/suites/upgrade/old/fs/fs/5-dumpling-workload/fsstress.yaml
deleted file mode 100644 (file)
index ae6f793..0000000
--- a/suites/upgrade/old/fs/fs/5-dumpling-workload/fsstress.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-     clients:
-        client.0:
-           - suites/fsstress.sh

diff --git a/suites/upgrade/old/fs/fs/5-dumpling-workload/iogen.yaml b/suites/upgrade/old/fs/fs/5-dumpling-workload/iogen.yaml
deleted file mode 100644 (file)
index 5aa4d3e..0000000
--- a/suites/upgrade/old/fs/fs/5-dumpling-workload/iogen.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-     clients:
-        all:
-           - suites/iogen.sh

diff --git a/suites/upgrade/old/fs/fs/5-dumpling-workload/kernel-untar-build.yaml b/suites/upgrade/old/fs/fs/5-dumpling-workload/kernel-untar-build.yaml
deleted file mode 100644 (file)
index 7fc7de9..0000000
--- a/suites/upgrade/old/fs/fs/5-dumpling-workload/kernel-untar-build.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-     clients:
-        all:
-           - kernel_untar_build.sh

diff --git a/suites/upgrade/old/fs/fs/5-dumpling-workload/tiobench.yaml b/suites/upgrade/old/fs/fs/5-dumpling-workload/tiobench.yaml
deleted file mode 100644 (file)
index 58ee040..0000000
--- a/suites/upgrade/old/fs/fs/5-dumpling-workload/tiobench.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-     clients:
-        all:
-           - suites/tiobench.sh

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

diff --git a/suites/upgrade/old/fs/fs/7-restart/mds-mon-osd.yaml b/suites/upgrade/old/fs/fs/7-restart/mds-mon-osd.yaml
deleted file mode 100644 (file)
index d218006..0000000
--- a/suites/upgrade/old/fs/fs/7-restart/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/old/fs/fs/7-restart/mon-mds-osd.yaml b/suites/upgrade/old/fs/fs/7-restart/mon-mds-osd.yaml
deleted file mode 100644 (file)
index 78e14e9..0000000
--- a/suites/upgrade/old/fs/fs/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/old/fs/fs/7-restart/osd-mds-mon.yaml b/suites/upgrade/old/fs/fs/7-restart/osd-mds-mon.yaml
deleted file mode 100644 (file)
index dbcd013..0000000
--- a/suites/upgrade/old/fs/fs/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/old/fs/fs/8-emperor-workload/blogbench.yaml b/suites/upgrade/old/fs/fs/8-emperor-workload/blogbench.yaml
deleted file mode 100644 (file)
index 4e54068..0000000
--- a/suites/upgrade/old/fs/fs/8-emperor-workload/blogbench.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-     branch: emperor
-     clients:
-        client.0:
-           - suites/blogbench.sh

diff --git a/suites/upgrade/old/fs/fs/8-emperor-workload/dbench.yaml b/suites/upgrade/old/fs/fs/8-emperor-workload/dbench.yaml
deleted file mode 100644 (file)
index 365ba9a..0000000
--- a/suites/upgrade/old/fs/fs/8-emperor-workload/dbench.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-     branch: emperor
-     clients:
-        all:
-           - suites/dbench.sh

diff --git a/suites/upgrade/old/fs/fs/8-emperor-workload/iogen.yaml b/suites/upgrade/old/fs/fs/8-emperor-workload/iogen.yaml
deleted file mode 100644 (file)
index 994fa87..0000000
--- a/suites/upgrade/old/fs/fs/8-emperor-workload/iogen.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-     branch: emperor
-     clients:
-        client.0:
-           - suites/iogen.sh

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

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

diff --git a/suites/upgrade/old/mixed-cluster/mixed-cluster/2-cuttlefish-workload/api.yaml b/suites/upgrade/old/mixed-cluster/mixed-cluster/2-cuttlefish-workload/api.yaml
deleted file mode 100644 (file)
index ad36bdd..0000000
--- a/suites/upgrade/old/mixed-cluster/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/old/mixed-cluster/mixed-cluster/2-cuttlefish-workload/load-gen-mix.yaml b/suites/upgrade/old/mixed-cluster/mixed-cluster/2-cuttlefish-workload/load-gen-mix.yaml
deleted file mode 100644 (file)
index 7ec655c..0000000
--- a/suites/upgrade/old/mixed-cluster/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/old/mixed-cluster/mixed-cluster/3-partial-osds-upgrade/dumpling.yaml b/suites/upgrade/old/mixed-cluster/mixed-cluster/3-partial-osds-upgrade/dumpling.yaml
deleted file mode 100644 (file)
index a9b9bf8..0000000
--- a/suites/upgrade/old/mixed-cluster/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/old/mixed-cluster/mixed-cluster/4-osds-restart/restart.yaml b/suites/upgrade/old/mixed-cluster/mixed-cluster/4-osds-restart/restart.yaml
deleted file mode 100644 (file)
index 3a84bbb..0000000
--- a/suites/upgrade/old/mixed-cluster/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/old/mixed-cluster/mixed-cluster/5-mixed-workload/api.yaml b/suites/upgrade/old/mixed-cluster/mixed-cluster/5-mixed-workload/api.yaml
deleted file mode 100644 (file)
index ad36bdd..0000000
--- a/suites/upgrade/old/mixed-cluster/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/old/mixed-cluster/mixed-cluster/5-mixed-workload/load-gen-big.yaml b/suites/upgrade/old/mixed-cluster/mixed-cluster/5-mixed-workload/load-gen-big.yaml
deleted file mode 100644 (file)
index 0f6e616..0000000
--- a/suites/upgrade/old/mixed-cluster/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/old/mixed-mons/mixed-mons/% b/suites/upgrade/old/mixed-mons/mixed-mons/%
deleted file mode 100644 (file)
index e69de29..0000000

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

diff --git a/suites/upgrade/old/mixed-mons/mixed-mons/2-cuttlefish-workload/cephtool.yaml b/suites/upgrade/old/mixed-mons/mixed-mons/2-cuttlefish-workload/cephtool.yaml
deleted file mode 100644 (file)
index 8648784..0000000
--- a/suites/upgrade/old/mixed-mons/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/old/mixed-mons/mixed-mons/3-partial-mon-upgrade/dumpling.yaml b/suites/upgrade/old/mixed-mons/mixed-mons/3-partial-mon-upgrade/dumpling.yaml
deleted file mode 100644 (file)
index 6c9d320..0000000
--- a/suites/upgrade/old/mixed-mons/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/old/mixed-mons/mixed-mons/4-mon-restart/restart.yaml b/suites/upgrade/old/mixed-mons/mixed-mons/4-mon-restart/restart.yaml
deleted file mode 100644 (file)
index b6ffb33..0000000
--- a/suites/upgrade/old/mixed-mons/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/old/mixed-mons/mixed-mons/5-mixed-workload/cephtool.yaml b/suites/upgrade/old/mixed-mons/mixed-mons/5-mixed-workload/cephtool.yaml
deleted file mode 100644 (file)
index 8648784..0000000
--- a/suites/upgrade/old/mixed-mons/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/old/mixed-mons/mixed-mons/6-rest/rest.yaml b/suites/upgrade/old/mixed-mons/mixed-mons/6-rest/rest.yaml
deleted file mode 100644 (file)
index 18ae735..0000000
--- a/suites/upgrade/old/mixed-mons/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/old/parallel/fs/% b/suites/upgrade/old/parallel/fs/%
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/upgrade/old/parallel/fs/0-cluster/start.yaml b/suites/upgrade/old/parallel/fs/0-cluster/start.yaml
deleted file mode 100644 (file)
index 01747e4..0000000
--- a/suites/upgrade/old/parallel/fs/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/old/parallel/fs/1-dumpling-install/dumpling.yaml b/suites/upgrade/old/parallel/fs/1-dumpling-install/dumpling.yaml
deleted file mode 100644 (file)
index 6d3947a..0000000
--- a/suites/upgrade/old/parallel/fs/1-dumpling-install/dumpling.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- install:
-    branch: dumpling
-- ceph:
-    fs: xfs
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/old/parallel/fs/2-workload/blogbench.yaml b/suites/upgrade/old/parallel/fs/2-workload/blogbench.yaml
deleted file mode 100644 (file)
index 0cd59ea..0000000
--- a/suites/upgrade/old/parallel/fs/2-workload/blogbench.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-workload:
-   workunit:
-      clients:
-         all:
-           - suites/blogbench.sh

diff --git a/suites/upgrade/old/parallel/fs/3-upgrade-sequence/upgrade-all.yaml b/suites/upgrade/old/parallel/fs/3-upgrade-sequence/upgrade-all.yaml
deleted file mode 100644 (file)
index 4cb05ce..0000000
--- a/suites/upgrade/old/parallel/fs/3-upgrade-sequence/upgrade-all.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: emperor
-   - ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3]

diff --git a/suites/upgrade/old/parallel/fs/distro b/suites/upgrade/old/parallel/fs/distro
deleted file mode 120000 (symlink)
index 3a0ac71..0000000
--- a/suites/upgrade/old/parallel/fs/distro
+++ /dev/null
@@ -1 +0,0 @@
-../rados/distro
\ No newline at end of file

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

diff --git a/suites/upgrade/old/parallel/rados/0-cluster/start.yaml b/suites/upgrade/old/parallel/rados/0-cluster/start.yaml
deleted file mode 100644 (file)
index 01747e4..0000000
--- a/suites/upgrade/old/parallel/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/old/parallel/rados/1-dumpling-install/dumpling.yaml b/suites/upgrade/old/parallel/rados/1-dumpling-install/dumpling.yaml
deleted file mode 100644 (file)
index f1a0930..0000000
--- a/suites/upgrade/old/parallel/rados/1-dumpling-install/dumpling.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- install:
-    branch: dumpling
-- ceph:
-   fs: xfs
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/old/parallel/rados/2-workload/loadgenbig.yaml b/suites/upgrade/old/parallel/rados/2-workload/loadgenbig.yaml
deleted file mode 100644 (file)
index b118459..0000000
--- a/suites/upgrade/old/parallel/rados/2-workload/loadgenbig.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-workload:
-   workunit:
-      branch: dumpling
-      clients:
-         all:
-           - rados/load-gen-big.sh

diff --git a/suites/upgrade/old/parallel/rados/2-workload/loadgenmix.yaml b/suites/upgrade/old/parallel/rados/2-workload/loadgenmix.yaml
deleted file mode 100644 (file)
index 8c7f4c5..0000000
--- a/suites/upgrade/old/parallel/rados/2-workload/loadgenmix.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-workload:
-   workunit:
-      branch: dumpling
-      clients:
-         client.0:
-           - rados/load-gen-mix.sh

diff --git a/suites/upgrade/old/parallel/rados/3-upgrade-sequence/upgrade-all.yaml b/suites/upgrade/old/parallel/rados/3-upgrade-sequence/upgrade-all.yaml
deleted file mode 100644 (file)
index 4cb05ce..0000000
--- a/suites/upgrade/old/parallel/rados/3-upgrade-sequence/upgrade-all.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: emperor
-   - ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3]

diff --git a/suites/upgrade/old/parallel/rados/3-upgrade-sequence/upgrade-mds-mon-osd.yaml b/suites/upgrade/old/parallel/rados/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
deleted file mode 100644 (file)
index 717f778..0000000
--- a/suites/upgrade/old/parallel/rados/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: emperor
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60
-   - ceph.restart:
-       daemons: [mon.a]
-       wait-for-healthy: false
-       wait-for-osds-up: true
-   - sleep:
-       duration: 60
-   - ceph.restart:
-       daemons: [mon.b]
-       wait-for-healthy: false
-       wait-for-osds-up: true
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.3]

diff --git a/suites/upgrade/old/parallel/rados/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/old/parallel/rados/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
deleted file mode 100644 (file)
index 8ad7503..0000000
--- a/suites/upgrade/old/parallel/rados/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: emperor
-   - ceph.restart:
-       daemons: [mon.a]
-       wait-for-healthy: false
-       wait-for-osds-up: true
-   - sleep:
-       duration: 60
-   - ceph.restart:
-       daemons: [mon.b]
-       wait-for-healthy: false
-       wait-for-osds-up: true
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.3]

diff --git a/suites/upgrade/old/parallel/rados/3-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade/old/parallel/rados/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
deleted file mode 100644 (file)
index a3607db..0000000
--- a/suites/upgrade/old/parallel/rados/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: emperor
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.3]
-   - sleep:
-       duration: 60
-   - ceph.restart:
-       daemons: [mon.a]
-       wait-for-healthy: false
-       wait-for-osds-up: true
-   - sleep:
-       duration: 60
-   - ceph.restart:
-       daemons: [mon.b]
-       wait-for-healthy: false
-       wait-for-osds-up: true
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60

diff --git a/suites/upgrade/old/parallel/rados/distro/centos_6.4.yaml b/suites/upgrade/old/parallel/rados/distro/centos_6.4.yaml
deleted file mode 100644 (file)
index 02383cd..0000000
--- a/suites/upgrade/old/parallel/rados/distro/centos_6.4.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-os_type: centos
-os_version: "6.4"

diff --git a/suites/upgrade/old/parallel/rados/distro/debian_7.0.yaml b/suites/upgrade/old/parallel/rados/distro/debian_7.0.yaml
deleted file mode 100644 (file)
index 8100dc4..0000000
--- a/suites/upgrade/old/parallel/rados/distro/debian_7.0.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-os_type: debian
-os_version: "7.0"

diff --git a/suites/upgrade/old/parallel/rados/distro/fedora_18.yaml b/suites/upgrade/old/parallel/rados/distro/fedora_18.yaml
deleted file mode 100644 (file)
index 07872aa..0000000
--- a/suites/upgrade/old/parallel/rados/distro/fedora_18.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-os_type: fedora
-os_version: "18"

diff --git a/suites/upgrade/old/parallel/rados/distro/rhel_6.3.yaml b/suites/upgrade/old/parallel/rados/distro/rhel_6.3.yaml
deleted file mode 100644 (file)
index 6a8edcd..0000000
--- a/suites/upgrade/old/parallel/rados/distro/rhel_6.3.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-os_type: rhel
-os_version: "6.3"

diff --git a/suites/upgrade/old/parallel/rados/distro/rhel_7.0.yaml b/suites/upgrade/old/parallel/rados/distro/rhel_7.0.yaml
deleted file mode 100644 (file)
index c87c0bc..0000000
--- a/suites/upgrade/old/parallel/rados/distro/rhel_7.0.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-os_type: rhel
-os_version: "7.0"

diff --git a/suites/upgrade/old/parallel/rados/distro/ubuntu_12.04.yaml b/suites/upgrade/old/parallel/rados/distro/ubuntu_12.04.yaml
deleted file mode 100644 (file)
index dbc3a8d..0000000
--- a/suites/upgrade/old/parallel/rados/distro/ubuntu_12.04.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-os_type: ubuntu
-os_version: "12.04"

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

diff --git a/suites/upgrade/old/parallel/rgw/0-cluster/start.yaml b/suites/upgrade/old/parallel/rgw/0-cluster/start.yaml
deleted file mode 100644 (file)
index 5b6d897..0000000
--- a/suites/upgrade/old/parallel/rgw/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
-  - client.1

diff --git a/suites/upgrade/old/parallel/rgw/1-dumpling-install/dumpling.yaml b/suites/upgrade/old/parallel/rgw/1-dumpling-install/dumpling.yaml
deleted file mode 100644 (file)
index f1a0930..0000000
--- a/suites/upgrade/old/parallel/rgw/1-dumpling-install/dumpling.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- install:
-    branch: dumpling
-- ceph:
-   fs: xfs
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/old/parallel/rgw/2-workload/s3tests.yaml b/suites/upgrade/old/parallel/rgw/2-workload/s3tests.yaml
deleted file mode 100644 (file)
index bd91e2c..0000000
--- a/suites/upgrade/old/parallel/rgw/2-workload/s3tests.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-workload:
-  sequential:
-    - rgw: [client.0]
-    - s3tests:
-        # use older tests when we are running a mix
-        client.0:
-          force-branch: dumpling
-          rgw_server: client.0

diff --git a/suites/upgrade/old/parallel/rgw/3-upgrade-sequence/upgrade-all.yaml b/suites/upgrade/old/parallel/rgw/3-upgrade-sequence/upgrade-all.yaml
deleted file mode 100644 (file)
index 2374096..0000000
--- a/suites/upgrade/old/parallel/rgw/3-upgrade-sequence/upgrade-all.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: emperor
-   - 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/old/parallel/rgw/4-final-workload/final.yaml b/suites/upgrade/old/parallel/rgw/4-final-workload/final.yaml
deleted file mode 100644 (file)
index fb754ed..0000000
--- a/suites/upgrade/old/parallel/rgw/4-final-workload/final.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- rgw: [client.1]
-- swift:
-    client.1:
-      rgw_server: client.1

diff --git a/suites/upgrade/old/parallel/rgw/distro b/suites/upgrade/old/parallel/rgw/distro
deleted file mode 120000 (symlink)
index 3a0ac71..0000000
--- a/suites/upgrade/old/parallel/rgw/distro
+++ /dev/null
@@ -1 +0,0 @@
-../rados/distro
\ No newline at end of file

diff --git a/suites/upgrade/old/parallel/stress-split/% b/suites/upgrade/old/parallel/stress-split/%
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/upgrade/old/parallel/stress-split/0-cluster/start.yaml b/suites/upgrade/old/parallel/stress-split/0-cluster/start.yaml
deleted file mode 100644 (file)
index 89d4b36..0000000
--- a/suites/upgrade/old/parallel/stress-split/0-cluster/start.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-roles:
-- - mon.a
-  - mon.b
-  - mds.a
-  - osd.0
-  - osd.1
-  - osd.2
-- - osd.3
-  - osd.4
-  - osd.5
-  - mon.c
-- - client.0

diff --git a/suites/upgrade/old/parallel/stress-split/1-dumpling-install/dumpling.yaml b/suites/upgrade/old/parallel/stress-split/1-dumpling-install/dumpling.yaml
deleted file mode 100644 (file)
index c98631e..0000000
--- a/suites/upgrade/old/parallel/stress-split/1-dumpling-install/dumpling.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- install:
-    branch: dumpling
-- ceph:
-    fs: xfs

diff --git a/suites/upgrade/old/parallel/stress-split/2-partial-upgrade/firsthalf.yaml b/suites/upgrade/old/parallel/stress-split/2-partial-upgrade/firsthalf.yaml
deleted file mode 100644 (file)
index 68c9d44..0000000
--- a/suites/upgrade/old/parallel/stress-split/2-partial-upgrade/firsthalf.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- install.upgrade:
-    osd.0:
-- ceph.restart:
-    daemons: [osd.0, osd.1, osd.2]

diff --git a/suites/upgrade/old/parallel/stress-split/3-thrash/default.yaml b/suites/upgrade/old/parallel/stress-split/3-thrash/default.yaml
deleted file mode 100644 (file)
index 21d4c75..0000000
--- a/suites/upgrade/old/parallel/stress-split/3-thrash/default.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-    - wrongly marked me down
-    - objects unfound and apparently lost
-    - log bound mismatch
-tasks:
-- thrashosds:
-    timeout: 1200
-    chance_pgnum_grow: 1
-    chance_pgpnum_fix: 1

diff --git a/suites/upgrade/old/parallel/stress-split/4-mon/mona.yaml b/suites/upgrade/old/parallel/stress-split/4-mon/mona.yaml
deleted file mode 100644 (file)
index b6ffb33..0000000
--- a/suites/upgrade/old/parallel/stress-split/4-mon/mona.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/old/parallel/stress-split/5-workload/rados_api_tests.yaml b/suites/upgrade/old/parallel/stress-split/5-workload/rados_api_tests.yaml
deleted file mode 100644 (file)
index 5797c2f..0000000
--- a/suites/upgrade/old/parallel/stress-split/5-workload/rados_api_tests.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-    branch: dumpling
-    clients:
-      client.0:
-        - rados/test.sh

diff --git a/suites/upgrade/old/parallel/stress-split/5-workload/radosbench.yaml b/suites/upgrade/old/parallel/stress-split/5-workload/radosbench.yaml
deleted file mode 100644 (file)
index 3940870..0000000
--- a/suites/upgrade/old/parallel/stress-split/5-workload/radosbench.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- radosbench:
-    clients: [client.0]
-    time: 1800

diff --git a/suites/upgrade/old/parallel/stress-split/5-workload/readwrite.yaml b/suites/upgrade/old/parallel/stress-split/5-workload/readwrite.yaml
deleted file mode 100644 (file)
index c53e52b..0000000
--- a/suites/upgrade/old/parallel/stress-split/5-workload/readwrite.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-tasks:
-- rados:
-    clients: [client.0]
-    ops: 4000
-    objects: 500
-    op_weights:
-      read: 45
-      write: 45
-      delete: 10

diff --git a/suites/upgrade/old/parallel/stress-split/5-workload/snaps-few-objects.yaml b/suites/upgrade/old/parallel/stress-split/5-workload/snaps-few-objects.yaml
deleted file mode 100644 (file)
index c540397..0000000
--- a/suites/upgrade/old/parallel/stress-split/5-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/old/parallel/stress-split/5-workload/snaps-many-objects.yaml b/suites/upgrade/old/parallel/stress-split/5-workload/snaps-many-objects.yaml
deleted file mode 100644 (file)
index 9e311c9..0000000
--- a/suites/upgrade/old/parallel/stress-split/5-workload/snaps-many-objects.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-tasks:
-- rados:
-    clients: [client.0]
-    ops: 4000
-    objects: 500
-    op_weights:
-      read: 100
-      write: 100
-      delete: 50
-      snap_create: 50
-      snap_remove: 50
-      rollback: 50

diff --git a/suites/upgrade/old/parallel/stress-split/6-next-mon/monb.yaml b/suites/upgrade/old/parallel/stress-split/6-next-mon/monb.yaml
deleted file mode 100644 (file)
index 513890c..0000000
--- a/suites/upgrade/old/parallel/stress-split/6-next-mon/monb.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- ceph.restart:
-    daemons: [mon.b]
-    wait-for-healthy: false
-    wait-for-osds-up: true

diff --git a/suites/upgrade/old/parallel/stress-split/7-workload/rados_api_tests.yaml b/suites/upgrade/old/parallel/stress-split/7-workload/rados_api_tests.yaml
deleted file mode 100644 (file)
index 5797c2f..0000000
--- a/suites/upgrade/old/parallel/stress-split/7-workload/rados_api_tests.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-    branch: dumpling
-    clients:
-      client.0:
-        - rados/test.sh

diff --git a/suites/upgrade/old/parallel/stress-split/8-next-mon/monc.yaml b/suites/upgrade/old/parallel/stress-split/8-next-mon/monc.yaml
deleted file mode 100644 (file)
index 28acc46..0000000
--- a/suites/upgrade/old/parallel/stress-split/8-next-mon/monc.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- install.upgrade:
-    mon.c: null
-- ceph.restart:
-    daemons: [mon.c]
-    wait-for-healthy: false
-    wait-for-osds-up: true
-- ceph.wait_for_mon_quorum: [a, b, c]

diff --git a/suites/upgrade/old/parallel/stress-split/9-workload/rados_api_tests.yaml b/suites/upgrade/old/parallel/stress-split/9-workload/rados_api_tests.yaml
deleted file mode 100644 (file)
index 5797c2f..0000000
--- a/suites/upgrade/old/parallel/stress-split/9-workload/rados_api_tests.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-    branch: dumpling
-    clients:
-      client.0:
-        - rados/test.sh

diff --git a/suites/upgrade/old/parallel/stress-split/distro b/suites/upgrade/old/parallel/stress-split/distro
deleted file mode 120000 (symlink)
index 3a0ac71..0000000
--- a/suites/upgrade/old/parallel/stress-split/distro
+++ /dev/null
@@ -1 +0,0 @@
-../rados/distro
\ No newline at end of file

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

diff --git a/suites/upgrade/old/rados-double/rados-double/0-cluster/start.yaml b/suites/upgrade/old/rados-double/rados-double/0-cluster/start.yaml
deleted file mode 100644 (file)
index 01747e4..0000000
--- a/suites/upgrade/old/rados-double/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/old/rados-double/rados-double/1-bobtail-install/bobtail.yaml b/suites/upgrade/old/rados-double/rados-double/1-bobtail-install/bobtail.yaml
deleted file mode 100644 (file)
index c676a55..0000000
--- a/suites/upgrade/old/rados-double/rados-double/1-bobtail-install/bobtail.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- install:
-     branch: bobtail
-- ceph:

diff --git a/suites/upgrade/old/rados-double/rados-double/2-bobtail-workload/api.yaml b/suites/upgrade/old/rados-double/rados-double/2-bobtail-workload/api.yaml
deleted file mode 100644 (file)
index 637b7a8..0000000
--- a/suites/upgrade/old/rados-double/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/old/rados-double/rados-double/3-upgrade/dumpling.yaml b/suites/upgrade/old/rados-double/rados-double/3-upgrade/dumpling.yaml
deleted file mode 100644 (file)
index e3e332c..0000000
--- a/suites/upgrade/old/rados-double/rados-double/3-upgrade/dumpling.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- install.upgrade:
-     all:
-        branch: dumpling

diff --git a/suites/upgrade/old/rados-double/rados-double/4-restart/upgrade_mon_mds_osd.yaml b/suites/upgrade/old/rados-double/rados-double/4-restart/upgrade_mon_mds_osd.yaml
deleted file mode 100644 (file)
index 78e14e9..0000000
--- a/suites/upgrade/old/rados-double/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/old/rados-double/rados-double/4-restart/upgrade_osd_mds_mon.yaml b/suites/upgrade/old/rados-double/rados-double/4-restart/upgrade_osd_mds_mon.yaml
deleted file mode 100644 (file)
index dbcd013..0000000
--- a/suites/upgrade/old/rados-double/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/old/rados-double/rados-double/5-dumpling-workload/api.yaml b/suites/upgrade/old/rados-double/rados-double/5-dumpling-workload/api.yaml
deleted file mode 100644 (file)
index b091ecc..0000000
--- a/suites/upgrade/old/rados-double/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/old/rados-double/rados-double/5-dumpling-workload/load-gen-mix.yaml b/suites/upgrade/old/rados-double/rados-double/5-dumpling-workload/load-gen-mix.yaml
deleted file mode 100644 (file)
index e89d1f5..0000000
--- a/suites/upgrade/old/rados-double/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/old/rados-double/rados-double/6-upgrade-next/next.yaml b/suites/upgrade/old/rados-double/rados-double/6-upgrade-next/next.yaml
deleted file mode 100644 (file)
index bb34346..0000000
--- a/suites/upgrade/old/rados-double/rados-double/6-upgrade-next/next.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-tasks:
-- install.upgrade:
-     all:

diff --git a/suites/upgrade/old/rados-double/rados-double/7-restart/mon-mds-osd.yaml b/suites/upgrade/old/rados-double/rados-double/7-restart/mon-mds-osd.yaml
deleted file mode 100644 (file)
index 78e14e9..0000000
--- a/suites/upgrade/old/rados-double/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/old/rados-double/rados-double/7-restart/osd-mds-mon.yaml b/suites/upgrade/old/rados-double/rados-double/7-restart/osd-mds-mon.yaml
deleted file mode 100644 (file)
index dbcd013..0000000
--- a/suites/upgrade/old/rados-double/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/old/rados-double/rados-double/8-next-workload/api.yaml b/suites/upgrade/old/rados-double/rados-double/8-next-workload/api.yaml
deleted file mode 100644 (file)
index 9b9f1f2..0000000
--- a/suites/upgrade/old/rados-double/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/old/rados-double/rados-double/8-next-workload/snaps-few-objects.yaml b/suites/upgrade/old/rados-double/rados-double/8-next-workload/snaps-few-objects.yaml
deleted file mode 100644 (file)
index aa82d97..0000000
--- a/suites/upgrade/old/rados-double/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/old/rados/rados/% b/suites/upgrade/old/rados/rados/%
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/upgrade/old/rados/rados/0-cluster/start.yaml b/suites/upgrade/old/rados/rados/0-cluster/start.yaml
deleted file mode 100644 (file)
index 01747e4..0000000
--- a/suites/upgrade/old/rados/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/old/rados/rados/1-cuttlefish-install/cuttlefish.yaml b/suites/upgrade/old/rados/rados/1-cuttlefish-install/cuttlefish.yaml
deleted file mode 100644 (file)
index b259af9..0000000
--- a/suites/upgrade/old/rados/rados/1-cuttlefish-install/cuttlefish.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- install:
-    branch: cuttlefish
-- ceph:

diff --git a/suites/upgrade/old/rados/rados/2-cuttlefish-workload/api.yaml b/suites/upgrade/old/rados/rados/2-cuttlefish-workload/api.yaml
deleted file mode 100644 (file)
index 6652658..0000000
--- a/suites/upgrade/old/rados/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/old/rados/rados/2-cuttlefish-workload/load-gen-mix.yaml b/suites/upgrade/old/rados/rados/2-cuttlefish-workload/load-gen-mix.yaml
deleted file mode 100644 (file)
index 7ec655c..0000000
--- a/suites/upgrade/old/rados/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/old/rados/rados/3-upgrade/dumpling.yaml b/suites/upgrade/old/rados/rados/3-upgrade/dumpling.yaml
deleted file mode 100644 (file)
index e3e332c..0000000
--- a/suites/upgrade/old/rados/rados/3-upgrade/dumpling.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- install.upgrade:
-     all:
-        branch: dumpling

diff --git a/suites/upgrade/old/rados/rados/4-restart/upgrade_mds_mon_osd.yaml b/suites/upgrade/old/rados/rados/4-restart/upgrade_mds_mon_osd.yaml
deleted file mode 100644 (file)
index d218006..0000000
--- a/suites/upgrade/old/rados/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/old/rados/rados/4-restart/upgrade_mon_mds_osd.yaml b/suites/upgrade/old/rados/rados/4-restart/upgrade_mon_mds_osd.yaml
deleted file mode 100644 (file)
index 78e14e9..0000000
--- a/suites/upgrade/old/rados/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/old/rados/rados/4-restart/upgrade_osd_mon_mds.yaml b/suites/upgrade/old/rados/rados/4-restart/upgrade_osd_mon_mds.yaml
deleted file mode 100644 (file)
index e8fe288..0000000
--- a/suites/upgrade/old/rados/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/old/rados/rados/5-dumpling-workload/api.yaml b/suites/upgrade/old/rados/rados/5-dumpling-workload/api.yaml
deleted file mode 100644 (file)
index b091ecc..0000000
--- a/suites/upgrade/old/rados/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/old/rados/rados/5-dumpling-workload/snaps-few-objects.yaml b/suites/upgrade/old/rados/rados/5-dumpling-workload/snaps-few-objects.yaml
deleted file mode 100644 (file)
index c540397..0000000
--- a/suites/upgrade/old/rados/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/old/rados/rados/6-upgrade-emp/emperor.yaml b/suites/upgrade/old/rados/rados/6-upgrade-emp/emperor.yaml
deleted file mode 100644 (file)
index e473f31..0000000
--- a/suites/upgrade/old/rados/rados/6-upgrade-emp/emperor.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- install.upgrade:
-     all:
-        branch: emperor

diff --git a/suites/upgrade/old/rados/rados/7-restart/upgrade_mds_mon_osd.yaml b/suites/upgrade/old/rados/rados/7-restart/upgrade_mds_mon_osd.yaml
deleted file mode 100644 (file)
index d218006..0000000
--- a/suites/upgrade/old/rados/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/old/rados/rados/7-restart/upgrade_mon_mds_osd.yaml b/suites/upgrade/old/rados/rados/7-restart/upgrade_mon_mds_osd.yaml
deleted file mode 100644 (file)
index 78e14e9..0000000
--- a/suites/upgrade/old/rados/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/old/rados/rados/7-restart/upgrade_osd_mds_mon.yaml b/suites/upgrade/old/rados/rados/7-restart/upgrade_osd_mds_mon.yaml
deleted file mode 100644 (file)
index dbcd013..0000000
--- a/suites/upgrade/old/rados/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/old/rados/rados/8-emperor-workload/api.yaml b/suites/upgrade/old/rados/rados/8-emperor-workload/api.yaml
deleted file mode 100644 (file)
index 29a4be1..0000000
--- a/suites/upgrade/old/rados/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/old/rados/rados/8-emperor-workload/snaps-few-objects.yaml b/suites/upgrade/old/rados/rados/8-emperor-workload/snaps-few-objects.yaml
deleted file mode 100644 (file)
index c540397..0000000
--- a/suites/upgrade/old/rados/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/old/rbd-double/rbd-double/% b/suites/upgrade/old/rbd-double/rbd-double/%
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/upgrade/old/rbd-double/rbd-double/0-cluster/start.yaml b/suites/upgrade/old/rbd-double/rbd-double/0-cluster/start.yaml
deleted file mode 100644 (file)
index 01747e4..0000000
--- a/suites/upgrade/old/rbd-double/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/old/rbd-double/rbd-double/1-bobtail-install/bobtail.yaml b/suites/upgrade/old/rbd-double/rbd-double/1-bobtail-install/bobtail.yaml
deleted file mode 100644 (file)
index c676a55..0000000
--- a/suites/upgrade/old/rbd-double/rbd-double/1-bobtail-install/bobtail.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- install:
-     branch: bobtail
-- ceph:

diff --git a/suites/upgrade/old/rbd-double/rbd-double/2-bobtail-workload/import_export.yaml b/suites/upgrade/old/rbd-double/rbd-double/2-bobtail-workload/import_export.yaml
deleted file mode 100644 (file)
index 9123db8..0000000
--- a/suites/upgrade/old/rbd-double/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/old/rbd-double/rbd-double/3-upgrade/dumpling.yaml b/suites/upgrade/old/rbd-double/rbd-double/3-upgrade/dumpling.yaml
deleted file mode 100644 (file)
index e3e332c..0000000
--- a/suites/upgrade/old/rbd-double/rbd-double/3-upgrade/dumpling.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- install.upgrade:
-     all:
-        branch: dumpling

diff --git a/suites/upgrade/old/rbd-double/rbd-double/4-restart/upgrade_mon_mds_osd.yaml b/suites/upgrade/old/rbd-double/rbd-double/4-restart/upgrade_mon_mds_osd.yaml
deleted file mode 100644 (file)
index 78e14e9..0000000
--- a/suites/upgrade/old/rbd-double/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/old/rbd-double/rbd-double/4-restart/upgrade_osd_mds_mon.yaml b/suites/upgrade/old/rbd-double/rbd-double/4-restart/upgrade_osd_mds_mon.yaml
deleted file mode 100644 (file)
index dbcd013..0000000
--- a/suites/upgrade/old/rbd-double/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/old/rbd-double/rbd-double/5-dumpling-workload/api.yaml b/suites/upgrade/old/rbd-double/rbd-double/5-dumpling-workload/api.yaml
deleted file mode 100644 (file)
index bbcde3e..0000000
--- a/suites/upgrade/old/rbd-double/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/old/rbd-double/rbd-double/5-dumpling-workload/cls.yaml b/suites/upgrade/old/rbd-double/rbd-double/5-dumpling-workload/cls.yaml
deleted file mode 100644 (file)
index c8079e3..0000000
--- a/suites/upgrade/old/rbd-double/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/old/rbd-double/rbd-double/6-upgrade-next/next.yaml b/suites/upgrade/old/rbd-double/rbd-double/6-upgrade-next/next.yaml
deleted file mode 100644 (file)
index bb34346..0000000
--- a/suites/upgrade/old/rbd-double/rbd-double/6-upgrade-next/next.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-tasks:
-- install.upgrade:
-     all:

diff --git a/suites/upgrade/old/rbd-double/rbd-double/7-restart/mon-mds-osd.yaml b/suites/upgrade/old/rbd-double/rbd-double/7-restart/mon-mds-osd.yaml
deleted file mode 100644 (file)
index 78e14e9..0000000
--- a/suites/upgrade/old/rbd-double/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/old/rbd-double/rbd-double/7-restart/osd-mds-mon.yaml b/suites/upgrade/old/rbd-double/rbd-double/7-restart/osd-mds-mon.yaml
deleted file mode 100644 (file)
index dbcd013..0000000
--- a/suites/upgrade/old/rbd-double/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/old/rbd-double/rbd-double/8-next-workload/import-export.yaml b/suites/upgrade/old/rbd-double/rbd-double/8-next-workload/import-export.yaml
deleted file mode 100644 (file)
index ae44a87..0000000
--- a/suites/upgrade/old/rbd-double/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/old/rbd-double/rbd-double/8-next-workload/python.yaml b/suites/upgrade/old/rbd-double/rbd-double/8-next-workload/python.yaml
deleted file mode 100644 (file)
index 5c6df6e..0000000
--- a/suites/upgrade/old/rbd-double/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/old/rbd/rbd/% b/suites/upgrade/old/rbd/rbd/%
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/upgrade/old/rbd/rbd/0-cluster/start.yaml b/suites/upgrade/old/rbd/rbd/0-cluster/start.yaml
deleted file mode 100644 (file)
index cd071f9..0000000
--- a/suites/upgrade/old/rbd/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/old/rbd/rbd/1-bobtail-workload/import_export.yaml b/suites/upgrade/old/rbd/rbd/1-bobtail-workload/import_export.yaml
deleted file mode 100644 (file)
index 9123db8..0000000
--- a/suites/upgrade/old/rbd/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/old/rbd/rbd/2-upgrade-to-dumpling/upgrade.yaml b/suites/upgrade/old/rbd/rbd/2-upgrade-to-dumpling/upgrade.yaml
deleted file mode 100644 (file)
index e3e332c..0000000
--- a/suites/upgrade/old/rbd/rbd/2-upgrade-to-dumpling/upgrade.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- install.upgrade:
-     all:
-        branch: dumpling

diff --git a/suites/upgrade/old/rbd/rbd/3-restart/mon-osd-mds.yaml b/suites/upgrade/old/rbd/rbd/3-restart/mon-osd-mds.yaml
deleted file mode 100644 (file)
index 31a79e4..0000000
--- a/suites/upgrade/old/rbd/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/old/rbd/rbd/3-restart/osd-mon-mds.yaml b/suites/upgrade/old/rbd/rbd/3-restart/osd-mon-mds.yaml
deleted file mode 100644 (file)
index e8fe288..0000000
--- a/suites/upgrade/old/rbd/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/old/rbd/rbd/4-dumpling-workload/api.yaml b/suites/upgrade/old/rbd/rbd/4-dumpling-workload/api.yaml
deleted file mode 100644 (file)
index bbcde3e..0000000
--- a/suites/upgrade/old/rbd/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/old/rbd/rbd/4-dumpling-workload/cls.yaml b/suites/upgrade/old/rbd/rbd/4-dumpling-workload/cls.yaml
deleted file mode 100644 (file)
index c8079e3..0000000
--- a/suites/upgrade/old/rbd/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/old/rbd/rbd/4-dumpling-workload/import-export.yaml b/suites/upgrade/old/rbd/rbd/4-dumpling-workload/import-export.yaml
deleted file mode 100644 (file)
index 364ef25..0000000
--- a/suites/upgrade/old/rbd/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/old/rbd/rbd/4-dumpling-workload/python.yaml b/suites/upgrade/old/rbd/rbd/4-dumpling-workload/python.yaml
deleted file mode 100644 (file)
index 737a821..0000000
--- a/suites/upgrade/old/rbd/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/old/rbd/rbd/5-upgrade-to-emperor/upgrade.yaml b/suites/upgrade/old/rbd/rbd/5-upgrade-to-emperor/upgrade.yaml
deleted file mode 100644 (file)
index e473f31..0000000
--- a/suites/upgrade/old/rbd/rbd/5-upgrade-to-emperor/upgrade.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- install.upgrade:
-     all:
-        branch: emperor

diff --git a/suites/upgrade/old/rbd/rbd/6-restart/mon-osd-mds.yaml b/suites/upgrade/old/rbd/rbd/6-restart/mon-osd-mds.yaml
deleted file mode 100644 (file)
index 31a79e4..0000000
--- a/suites/upgrade/old/rbd/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/old/rbd/rbd/6-restart/osd-mon-mds.yaml b/suites/upgrade/old/rbd/rbd/6-restart/osd-mon-mds.yaml
deleted file mode 100644 (file)
index e8fe288..0000000
--- a/suites/upgrade/old/rbd/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/old/rbd/rbd/7-emperor-workload/import_export.yaml b/suites/upgrade/old/rbd/rbd/7-emperor-workload/import_export.yaml
deleted file mode 100644 (file)
index e297887..0000000
--- a/suites/upgrade/old/rbd/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/old/rgw-double/rgw-double/% b/suites/upgrade/old/rgw-double/rgw-double/%
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/upgrade/old/rgw-double/rgw-double/0-cluster/start.yaml b/suites/upgrade/old/rgw-double/rgw-double/0-cluster/start.yaml
deleted file mode 100644 (file)
index 01747e4..0000000
--- a/suites/upgrade/old/rgw-double/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/old/rgw-double/rgw-double/1-bobtail-install/bobtail.yaml b/suites/upgrade/old/rgw-double/rgw-double/1-bobtail-install/bobtail.yaml
deleted file mode 100644 (file)
index ca81c71..0000000
--- a/suites/upgrade/old/rgw-double/rgw-double/1-bobtail-install/bobtail.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- install:
-     branch: bobtail
-- ceph:
-- rgw:

diff --git a/suites/upgrade/old/rgw-double/rgw-double/2-bobtail-workload/s3tests.yaml b/suites/upgrade/old/rgw-double/rgw-double/2-bobtail-workload/s3tests.yaml
deleted file mode 100644 (file)
index 7397ae6..0000000
--- a/suites/upgrade/old/rgw-double/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/old/rgw-double/rgw-double/3-upgrade/dumpling.yaml b/suites/upgrade/old/rgw-double/rgw-double/3-upgrade/dumpling.yaml
deleted file mode 100644 (file)
index e3e332c..0000000
--- a/suites/upgrade/old/rgw-double/rgw-double/3-upgrade/dumpling.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- install.upgrade:
-     all:
-        branch: dumpling

diff --git a/suites/upgrade/old/rgw-double/rgw-double/4-restart/upgrade_mon_mds_osd.yaml b/suites/upgrade/old/rgw-double/rgw-double/4-restart/upgrade_mon_mds_osd.yaml
deleted file mode 100644 (file)
index 8666590..0000000
--- a/suites/upgrade/old/rgw-double/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/old/rgw-double/rgw-double/4-restart/upgrade_osd_mds_mon.yaml b/suites/upgrade/old/rgw-double/rgw-double/4-restart/upgrade_osd_mds_mon.yaml
deleted file mode 100644 (file)
index 425cf60..0000000
--- a/suites/upgrade/old/rgw-double/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/old/rgw-double/rgw-double/5-dumpling-workload/readwrite.yaml b/suites/upgrade/old/rgw-double/rgw-double/5-dumpling-workload/readwrite.yaml
deleted file mode 100644 (file)
index d3166f1..0000000
--- a/suites/upgrade/old/rgw-double/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/old/rgw-double/rgw-double/5-dumpling-workload/s3tests.yaml b/suites/upgrade/old/rgw-double/rgw-double/5-dumpling-workload/s3tests.yaml
deleted file mode 100644 (file)
index 6506960..0000000
--- a/suites/upgrade/old/rgw-double/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/old/rgw-double/rgw-double/5-dumpling-workload/swift.yaml b/suites/upgrade/old/rgw-double/rgw-double/5-dumpling-workload/swift.yaml
deleted file mode 100644 (file)
index 45e2fc9..0000000
--- a/suites/upgrade/old/rgw-double/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/old/rgw-double/rgw-double/6-upgrade-next/next.yaml b/suites/upgrade/old/rgw-double/rgw-double/6-upgrade-next/next.yaml
deleted file mode 100644 (file)
index bb34346..0000000
--- a/suites/upgrade/old/rgw-double/rgw-double/6-upgrade-next/next.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-tasks:
-- install.upgrade:
-     all:

diff --git a/suites/upgrade/old/rgw-double/rgw-double/7-restart/mon-mds-osd.yaml b/suites/upgrade/old/rgw-double/rgw-double/7-restart/mon-mds-osd.yaml
deleted file mode 100644 (file)
index 8666590..0000000
--- a/suites/upgrade/old/rgw-double/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/old/rgw-double/rgw-double/7-restart/osd-mds-mon.yaml b/suites/upgrade/old/rgw-double/rgw-double/7-restart/osd-mds-mon.yaml
deleted file mode 100644 (file)
index 425cf60..0000000
--- a/suites/upgrade/old/rgw-double/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/old/rgw-double/rgw-double/8-next-workload/readwrite.yaml b/suites/upgrade/old/rgw-double/rgw-double/8-next-workload/readwrite.yaml
deleted file mode 100644 (file)
index d3166f1..0000000
--- a/suites/upgrade/old/rgw-double/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/old/rgw-double/rgw-double/8-next-workload/s3tests.yaml b/suites/upgrade/old/rgw-double/rgw-double/8-next-workload/s3tests.yaml
deleted file mode 100644 (file)
index 573cffb..0000000
--- a/suites/upgrade/old/rgw-double/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/old/rgw-double/rgw-double/8-next-workload/swift.yaml b/suites/upgrade/old/rgw-double/rgw-double/8-next-workload/swift.yaml
deleted file mode 100644 (file)
index 45e2fc9..0000000
--- a/suites/upgrade/old/rgw-double/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/old/rgw/rgw/% b/suites/upgrade/old/rgw/rgw/%
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/upgrade/old/rgw/rgw/0-cluster/start.yaml b/suites/upgrade/old/rgw/rgw/0-cluster/start.yaml
deleted file mode 100644 (file)
index 8b1ebbe..0000000
--- a/suites/upgrade/old/rgw/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/old/rgw/rgw/1-bobtail-workload/s3readwrite.yaml b/suites/upgrade/old/rgw/rgw/1-bobtail-workload/s3readwrite.yaml
deleted file mode 100644 (file)
index d3166f1..0000000
--- a/suites/upgrade/old/rgw/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/old/rgw/rgw/1-bobtail-workload/s3tests.yaml b/suites/upgrade/old/rgw/rgw/1-bobtail-workload/s3tests.yaml
deleted file mode 100644 (file)
index 8020d79..0000000
--- a/suites/upgrade/old/rgw/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/old/rgw/rgw/1-bobtail-workload/swift.yaml b/suites/upgrade/old/rgw/rgw/1-bobtail-workload/swift.yaml
deleted file mode 100644 (file)
index 45e2fc9..0000000
--- a/suites/upgrade/old/rgw/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/old/rgw/rgw/2-upgrade-to-dumpling/upgrade.yaml b/suites/upgrade/old/rgw/rgw/2-upgrade-to-dumpling/upgrade.yaml
deleted file mode 100644 (file)
index e3e332c..0000000
--- a/suites/upgrade/old/rgw/rgw/2-upgrade-to-dumpling/upgrade.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- install.upgrade:
-     all:
-        branch: dumpling

diff --git a/suites/upgrade/old/rgw/rgw/3-restart/mon-osd-mds.yaml b/suites/upgrade/old/rgw/rgw/3-restart/mon-osd-mds.yaml
deleted file mode 100644 (file)
index ea8a58c..0000000
--- a/suites/upgrade/old/rgw/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/old/rgw/rgw/3-restart/osd-mon-mds.yaml b/suites/upgrade/old/rgw/rgw/3-restart/osd-mon-mds.yaml
deleted file mode 100644 (file)
index f9606ef..0000000
--- a/suites/upgrade/old/rgw/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/old/rgw/rgw/4-dumpling-workload/readwrite.yaml b/suites/upgrade/old/rgw/rgw/4-dumpling-workload/readwrite.yaml
deleted file mode 100644 (file)
index d3166f1..0000000
--- a/suites/upgrade/old/rgw/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/old/rgw/rgw/4-dumpling-workload/s3tests.yaml b/suites/upgrade/old/rgw/rgw/4-dumpling-workload/s3tests.yaml
deleted file mode 100644 (file)
index 6506960..0000000
--- a/suites/upgrade/old/rgw/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/old/rgw/rgw/4-dumpling-workload/swift.yaml b/suites/upgrade/old/rgw/rgw/4-dumpling-workload/swift.yaml
deleted file mode 100644 (file)
index 45e2fc9..0000000
--- a/suites/upgrade/old/rgw/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/old/rgw/rgw/5-upgrade-to-emperor/upgrade.yaml b/suites/upgrade/old/rgw/rgw/5-upgrade-to-emperor/upgrade.yaml
deleted file mode 100644 (file)
index e473f31..0000000
--- a/suites/upgrade/old/rgw/rgw/5-upgrade-to-emperor/upgrade.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- install.upgrade:
-     all:
-        branch: emperor

diff --git a/suites/upgrade/old/rgw/rgw/6-restart/mon-osd-mds.yaml b/suites/upgrade/old/rgw/rgw/6-restart/mon-osd-mds.yaml
deleted file mode 100644 (file)
index ea8a58c..0000000
--- a/suites/upgrade/old/rgw/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/old/rgw/rgw/6-restart/osd-mon-mds.yaml b/suites/upgrade/old/rgw/rgw/6-restart/osd-mon-mds.yaml
deleted file mode 100644 (file)
index f9606ef..0000000
--- a/suites/upgrade/old/rgw/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/old/rgw/rgw/7-emperor-workload/readwrite.yaml b/suites/upgrade/old/rgw/rgw/7-emperor-workload/readwrite.yaml
deleted file mode 100644 (file)
index d3166f1..0000000
--- a/suites/upgrade/old/rgw/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/old/rgw/rgw/7-emperor-workload/s3tests.yaml b/suites/upgrade/old/rgw/rgw/7-emperor-workload/s3tests.yaml
deleted file mode 100644 (file)
index cc9675c..0000000
--- a/suites/upgrade/old/rgw/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/old/rgw/rgw/7-emperor-workload/swift.yaml b/suites/upgrade/old/rgw/rgw/7-emperor-workload/swift.yaml
deleted file mode 100644 (file)
index 45e2fc9..0000000
--- a/suites/upgrade/old/rgw/rgw/7-emperor-workload/swift.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- swift:
-    client.0:
-      rgw_server: client.0

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

diff --git a/suites/upgrade/old/small/fs/0-cluster/start.yaml b/suites/upgrade/old/small/fs/0-cluster/start.yaml
deleted file mode 100644 (file)
index 01747e4..0000000
--- a/suites/upgrade/old/small/fs/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/old/small/fs/1-dumpling-install/dumpling.yaml b/suites/upgrade/old/small/fs/1-dumpling-install/dumpling.yaml
deleted file mode 100644 (file)
index d99595e..0000000
--- a/suites/upgrade/old/small/fs/1-dumpling-install/dumpling.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- install:
-    branch: dumpling
-- ceph:
-    fs: xfs
-- ceph-fuse:

diff --git a/suites/upgrade/old/small/fs/2-workload/blogbench.yaml b/suites/upgrade/old/small/fs/2-workload/blogbench.yaml
deleted file mode 100644 (file)
index edf7170..0000000
--- a/suites/upgrade/old/small/fs/2-workload/blogbench.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:  
-- workunit:
-      clients:
-         all:
-           - suites/blogbench.sh

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

diff --git a/suites/upgrade/old/small/fs/4-restart/restart.yaml b/suites/upgrade/old/small/fs/4-restart/restart.yaml
deleted file mode 100644 (file)
index 4290b2b..0000000
--- a/suites/upgrade/old/small/fs/4-restart/restart.yaml
+++ /dev/null
@@ -1,3 +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/old/small/fs/5-emperor-workload/emperor.yaml b/suites/upgrade/old/small/fs/5-emperor-workload/emperor.yaml
deleted file mode 100644 (file)
index 3f54d54..0000000
--- a/suites/upgrade/old/small/fs/5-emperor-workload/emperor.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-     branch: emperor
-     clients:
-        client.0:
-           - suites/dbench.sh

diff --git a/suites/upgrade/old/small/fs/distro b/suites/upgrade/old/small/fs/distro
deleted file mode 120000 (symlink)
index 3a0ac71..0000000
--- a/suites/upgrade/old/small/fs/distro
+++ /dev/null
@@ -1 +0,0 @@
-../rados/distro
\ No newline at end of file

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

diff --git a/suites/upgrade/old/small/rados/0-cluster/start.yaml b/suites/upgrade/old/small/rados/0-cluster/start.yaml
deleted file mode 100644 (file)
index 01747e4..0000000
--- a/suites/upgrade/old/small/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/old/small/rados/1-dumpling-install/dumpling.yaml b/suites/upgrade/old/small/rados/1-dumpling-install/dumpling.yaml
deleted file mode 100644 (file)
index c98631e..0000000
--- a/suites/upgrade/old/small/rados/1-dumpling-install/dumpling.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- install:
-    branch: dumpling
-- ceph:
-    fs: xfs

diff --git a/suites/upgrade/old/small/rados/2-workload/loadgenbig.yaml b/suites/upgrade/old/small/rados/2-workload/loadgenbig.yaml
deleted file mode 100644 (file)
index 9c5c2c7..0000000
--- a/suites/upgrade/old/small/rados/2-workload/loadgenbig.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-      branch: dumpling
-      clients:
-         all:
-           - rados/load-gen-big.sh

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

diff --git a/suites/upgrade/old/small/rados/4-restart/restart.yaml b/suites/upgrade/old/small/rados/4-restart/restart.yaml
deleted file mode 100644 (file)
index 78e14e9..0000000
--- a/suites/upgrade/old/small/rados/4-restart/restart.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/old/small/rados/5-emperor-workload/emperor.yaml b/suites/upgrade/old/small/rados/5-emperor-workload/emperor.yaml
deleted file mode 100644 (file)
index 58d439c..0000000
--- a/suites/upgrade/old/small/rados/5-emperor-workload/emperor.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-    branch: emperor
-    clients:
-      client.0:
-        - rados/test.sh

diff --git a/suites/upgrade/old/small/rados/distro/centos_6.4.yaml b/suites/upgrade/old/small/rados/distro/centos_6.4.yaml
deleted file mode 100644 (file)
index 02383cd..0000000
--- a/suites/upgrade/old/small/rados/distro/centos_6.4.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-os_type: centos
-os_version: "6.4"

diff --git a/suites/upgrade/old/small/rados/distro/debian_7.0.yaml b/suites/upgrade/old/small/rados/distro/debian_7.0.yaml
deleted file mode 100644 (file)
index 8100dc4..0000000
--- a/suites/upgrade/old/small/rados/distro/debian_7.0.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-os_type: debian
-os_version: "7.0"

diff --git a/suites/upgrade/old/small/rados/distro/fedora_18.yaml b/suites/upgrade/old/small/rados/distro/fedora_18.yaml
deleted file mode 100644 (file)
index 07872aa..0000000
--- a/suites/upgrade/old/small/rados/distro/fedora_18.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-os_type: fedora
-os_version: "18"

diff --git a/suites/upgrade/old/small/rados/distro/rhel_6.3.yaml b/suites/upgrade/old/small/rados/distro/rhel_6.3.yaml
deleted file mode 100644 (file)
index 6a8edcd..0000000
--- a/suites/upgrade/old/small/rados/distro/rhel_6.3.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-os_type: rhel
-os_version: "6.3"

diff --git a/suites/upgrade/old/small/rados/distro/rhel_6.4.yaml b/suites/upgrade/old/small/rados/distro/rhel_6.4.yaml
deleted file mode 100644 (file)
index 5225495..0000000
--- a/suites/upgrade/old/small/rados/distro/rhel_6.4.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-os_type: rhel
-os_version: "6.4"

diff --git a/suites/upgrade/old/small/rados/distro/rhel_7.0.yaml b/suites/upgrade/old/small/rados/distro/rhel_7.0.yaml
deleted file mode 100644 (file)
index c87c0bc..0000000
--- a/suites/upgrade/old/small/rados/distro/rhel_7.0.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-os_type: rhel
-os_version: "7.0"

diff --git a/suites/upgrade/old/small/rados/distro/ubuntu_12.04.yaml b/suites/upgrade/old/small/rados/distro/ubuntu_12.04.yaml
deleted file mode 100644 (file)
index dbc3a8d..0000000
--- a/suites/upgrade/old/small/rados/distro/ubuntu_12.04.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-os_type: ubuntu
-os_version: "12.04"

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

diff --git a/suites/upgrade/old/small/rbd/0-cluster/start.yaml b/suites/upgrade/old/small/rbd/0-cluster/start.yaml
deleted file mode 100644 (file)
index 01747e4..0000000
--- a/suites/upgrade/old/small/rbd/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/old/small/rbd/1-dumpling-install/dumpling.yaml b/suites/upgrade/old/small/rbd/1-dumpling-install/dumpling.yaml
deleted file mode 100644 (file)
index c98631e..0000000
--- a/suites/upgrade/old/small/rbd/1-dumpling-install/dumpling.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- install:
-    branch: dumpling
-- ceph:
-    fs: xfs

diff --git a/suites/upgrade/old/small/rbd/2-workload/workload.yaml b/suites/upgrade/old/small/rbd/2-workload/workload.yaml
deleted file mode 100644 (file)
index 364ef25..0000000
--- a/suites/upgrade/old/small/rbd/2-workload/workload.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/old/small/rbd/3-upgrade-sequence/upgrade-all.yaml b/suites/upgrade/old/small/rbd/3-upgrade-sequence/upgrade-all.yaml
deleted file mode 100644 (file)
index e473f31..0000000
--- a/suites/upgrade/old/small/rbd/3-upgrade-sequence/upgrade-all.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- install.upgrade:
-     all:
-        branch: emperor

diff --git a/suites/upgrade/old/small/rbd/4-restart/restart.yaml b/suites/upgrade/old/small/rbd/4-restart/restart.yaml
deleted file mode 100644 (file)
index e8fe288..0000000
--- a/suites/upgrade/old/small/rbd/4-restart/restart.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/old/small/rbd/5-emperor-workload/final.yaml b/suites/upgrade/old/small/rbd/5-emperor-workload/final.yaml
deleted file mode 100644 (file)
index 19b5bd3..0000000
--- a/suites/upgrade/old/small/rbd/5-emperor-workload/final.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-     branch: emperor
-     clients:
-        client.0:
-           - cls/test_cls_rbd.sh

diff --git a/suites/upgrade/old/small/rbd/distro b/suites/upgrade/old/small/rbd/distro
deleted file mode 120000 (symlink)
index 3a0ac71..0000000
--- a/suites/upgrade/old/small/rbd/distro
+++ /dev/null
@@ -1 +0,0 @@
-../rados/distro
\ No newline at end of file

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

diff --git a/suites/upgrade/old/small/rgw/0-cluster/start.yaml b/suites/upgrade/old/small/rgw/0-cluster/start.yaml
deleted file mode 100644 (file)
index 01747e4..0000000
--- a/suites/upgrade/old/small/rgw/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/old/small/rgw/1-dumpling-install/dumpling.yaml b/suites/upgrade/old/small/rgw/1-dumpling-install/dumpling.yaml
deleted file mode 100644 (file)
index fe05a61..0000000
--- a/suites/upgrade/old/small/rgw/1-dumpling-install/dumpling.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- install:
-    branch: dumpling
-- ceph:
-    fs: xfs
-- rgw: [client.0]

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

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

diff --git a/suites/upgrade/old/small/rgw/4-restart/restart.yaml b/suites/upgrade/old/small/rgw/4-restart/restart.yaml
deleted file mode 100644 (file)
index f9606ef..0000000
--- a/suites/upgrade/old/small/rgw/4-restart/restart.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/old/small/rgw/5-emperor-workload/final.yaml b/suites/upgrade/old/small/rgw/5-emperor-workload/final.yaml
deleted file mode 100644 (file)
index 573cffb..0000000
--- a/suites/upgrade/old/small/rgw/5-emperor-workload/final.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- s3tests:
-    client.0:
-      rgw_server: client.0

diff --git a/suites/upgrade/old/small/rgw/distro b/suites/upgrade/old/small/rgw/distro
deleted file mode 120000 (symlink)
index 3a0ac71..0000000
--- a/suites/upgrade/old/small/rgw/distro
+++ /dev/null
@@ -1 +0,0 @@
-../rados/distro
\ No newline at end of file