From: Sage Weil Date: Tue, 30 Sep 2014 23:09:07 +0000 (-0700) Subject: upgrade/cuttlefish, emperor, old: remove X-Git-Tag: v0.94.10~27^2^2~286 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=28449710a079e1a38ba84c757086c8a03e4fb43b;p=ceph.git upgrade/cuttlefish, emperor, old: remove Signed-off-by: Sage Weil --- diff --git a/suites/upgrade/cuttlefish/fs/% b/suites/upgrade/cuttlefish/fs/% deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/suites/upgrade/cuttlefish/fs/0-cluster/start.yaml b/suites/upgrade/cuttlefish/fs/0-cluster/start.yaml deleted file mode 100644 index c1acc4e8ad65..000000000000 --- 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 index 286cdd666243..000000000000 --- 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 index 07d04317ec15..000000000000 --- 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 index 9d74ab38f00c..000000000000 --- 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 index 0cd59eaafdea..000000000000 --- 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 index c97aef77e13a..000000000000 --- 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 index 9d06ef37d05a..000000000000 --- 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 index dd76b10b5ce7..000000000000 --- 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 index 13af446eb3b2..000000000000 --- 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 index dbd7191e36cc..000000000000 --- 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 index e69de29bb2d1..000000000000 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 index 8626abc26c4f..000000000000 --- 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 index 21dc2bb2b273..000000000000 --- 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 index c77ab27ba836..000000000000 --- 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 index aca276b8d390..000000000000 --- 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 index c44994e5eafc..000000000000 --- 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 index d46a1a1527ef..000000000000 --- 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 index fe892358df88..000000000000 --- 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 index e70e5d0cf1ba..000000000000 --- 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 index ed25b701597b..000000000000 --- 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 index 33368cd8df71..000000000000 --- 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 index 49339ecd0441..000000000000 --- 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 index 810ba1b30e24..000000000000 --- 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 index f81504233ad2..000000000000 --- 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 index e69de29bb2d1..000000000000 diff --git a/suites/upgrade/cuttlefish/rados/0-cluster/start.yaml b/suites/upgrade/cuttlefish/rados/0-cluster/start.yaml deleted file mode 100644 index c1acc4e8ad65..000000000000 --- 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 index 286cdd666243..000000000000 --- 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 index 07d04317ec15..000000000000 --- 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 index 9d74ab38f00c..000000000000 --- 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 index 8eaab19fd9e5..000000000000 --- 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 index c97aef77e13a..000000000000 --- 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 index 9d06ef37d05a..000000000000 --- 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 index c061399adacd..000000000000 --- 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 index 810ba1b30e24..000000000000 --- 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 index f81504233ad2..000000000000 --- 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 index e69de29bb2d1..000000000000 diff --git a/suites/upgrade/cuttlefish/rbd/0-cluster/start.yaml b/suites/upgrade/cuttlefish/rbd/0-cluster/start.yaml deleted file mode 100644 index c1acc4e8ad65..000000000000 --- 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 index 286cdd666243..000000000000 --- 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 index 07d04317ec15..000000000000 --- 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 index 9d74ab38f00c..000000000000 --- 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 index ce2fabe03595..000000000000 --- 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 index c97aef77e13a..000000000000 --- 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 index 9d06ef37d05a..000000000000 --- 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 index dd76b10b5ce7..000000000000 --- 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 index 593191c24f5a..000000000000 --- 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 index 575fd7922adf..000000000000 --- 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 index e69de29bb2d1..000000000000 diff --git a/suites/upgrade/cuttlefish/rgw/0-cluster/start.yaml b/suites/upgrade/cuttlefish/rgw/0-cluster/start.yaml deleted file mode 100644 index c1acc4e8ad65..000000000000 --- 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 index 286cdd666243..000000000000 --- 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 index 07d04317ec15..000000000000 --- 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 index 9d74ab38f00c..000000000000 --- 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 index f1b2f3e88ef6..000000000000 --- 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 index 0de4f185fa29..000000000000 --- 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 index c7fa40f1f50a..000000000000 --- 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 index 0d0639ed74a7..000000000000 --- 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 index 9361edc8015d..000000000000 --- 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 index 6cf6d861d5ff..000000000000 --- 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 index e69de29bb2d1..000000000000 diff --git a/suites/upgrade/emperor/fs/0-cluster/start.yaml b/suites/upgrade/emperor/fs/0-cluster/start.yaml deleted file mode 100644 index c1acc4e8ad65..000000000000 --- 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 index a2891c427c28..000000000000 --- 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 index 7750040f1383..000000000000 --- 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 index 9d0ded4f56f8..000000000000 --- 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 index 368f0ec479e5..000000000000 --- 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 index 0cd59eaafdea..000000000000 --- 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 index 520dc4b30cf1..000000000000 --- 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 index e11f8c3b13fd..000000000000 --- 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 index 78cb33be1eca..000000000000 --- 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 index 13af446eb3b2..000000000000 --- 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 index dbd7191e36cc..000000000000 --- 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 index e69de29bb2d1..000000000000 diff --git a/suites/upgrade/emperor/rados/0-cluster/start.yaml b/suites/upgrade/emperor/rados/0-cluster/start.yaml deleted file mode 100644 index c1acc4e8ad65..000000000000 --- 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 index a2891c427c28..000000000000 --- 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 index 7750040f1383..000000000000 --- 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 index 9d0ded4f56f8..000000000000 --- 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 index 368f0ec479e5..000000000000 --- 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 index 8eaab19fd9e5..000000000000 --- 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 index 520dc4b30cf1..000000000000 --- 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 index e11f8c3b13fd..000000000000 --- 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 index f0fa4b886c59..000000000000 --- 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 index 810ba1b30e24..000000000000 --- 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 index f81504233ad2..000000000000 --- 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 index e69de29bb2d1..000000000000 diff --git a/suites/upgrade/emperor/rbd/0-cluster/start.yaml b/suites/upgrade/emperor/rbd/0-cluster/start.yaml deleted file mode 100644 index c1acc4e8ad65..000000000000 --- 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 index a2891c427c28..000000000000 --- 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 index 7750040f1383..000000000000 --- 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 index 9d0ded4f56f8..000000000000 --- 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 index 368f0ec479e5..000000000000 --- 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 index ce2fabe03595..000000000000 --- 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 index 520dc4b30cf1..000000000000 --- 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 index e11f8c3b13fd..000000000000 --- 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 index 78cb33be1eca..000000000000 --- 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 index 593191c24f5a..000000000000 --- 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 index 575fd7922adf..000000000000 --- 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 index e69de29bb2d1..000000000000 diff --git a/suites/upgrade/emperor/rgw/0-cluster/start.yaml b/suites/upgrade/emperor/rgw/0-cluster/start.yaml deleted file mode 100644 index c1acc4e8ad65..000000000000 --- 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 index a2891c427c28..000000000000 --- 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 index 7750040f1383..000000000000 --- 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 index 9d0ded4f56f8..000000000000 --- 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 index 368f0ec479e5..000000000000 --- 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 index f1b2f3e88ef6..000000000000 --- 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 index 0ae6f9280962..000000000000 --- 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 index 3f0aad2ec869..000000000000 --- 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 index 622b02d42714..000000000000 --- 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 index 9361edc8015d..000000000000 --- 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 index 6cf6d861d5ff..000000000000 --- 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 index e69de29bb2d1..000000000000 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 index 01747e420561..000000000000 --- 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 index e427343d8c30..000000000000 --- 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 index 50161b081142..000000000000 --- 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 index 3bb9040e251a..000000000000 --- 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 index c832d2f5bb1a..000000000000 --- 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 index e3e332c4f228..000000000000 --- 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 index d21800684d33..000000000000 --- 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 index 78e14e9472a4..000000000000 --- 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 index dbcd013b3f0e..000000000000 --- 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 index ae6f79369895..000000000000 --- 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 index 5aa4d3e091d7..000000000000 --- 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 index 7fc7de979ed7..000000000000 --- 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 index 58ee040af77f..000000000000 --- 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 index e473f31862db..000000000000 --- 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 index d21800684d33..000000000000 --- 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 index 78e14e9472a4..000000000000 --- 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 index dbcd013b3f0e..000000000000 --- 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 index 4e54068f3142..000000000000 --- 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 index 365ba9ac8f42..000000000000 --- 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 index 994fa8716d53..000000000000 --- 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 index e69de29bb2d1..000000000000 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 index 0a85eacad7f0..000000000000 --- 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 index 50b65f72bcaf..000000000000 --- 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 index ad36bddb48c1..000000000000 --- 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 index 7ec655c8ccfc..000000000000 --- 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 index a9b9bf8418c9..000000000000 --- 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 index 3a84bbb4074a..000000000000 --- 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 index ad36bddb48c1..000000000000 --- 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 index 0f6e616a2862..000000000000 --- 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 index e69de29bb2d1..000000000000 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 index 0a85eacad7f0..000000000000 --- 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 index 50b65f72bcaf..000000000000 --- 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 index 8648784fd161..000000000000 --- 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 index 6c9d3206f167..000000000000 --- 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 index b6ffb3323d11..000000000000 --- 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 index 8648784fd161..000000000000 --- 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 index 18ae735e6637..000000000000 --- 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 index e69de29bb2d1..000000000000 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 index 01747e420561..000000000000 --- 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 index 6d3947abd90e..000000000000 --- 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 index 0cd59eaafdea..000000000000 --- 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 index 4cb05ce8777f..000000000000 --- 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 index 3a0ac71c8af5..000000000000 --- 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 index e69de29bb2d1..000000000000 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 index 01747e420561..000000000000 --- 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 index f1a09304712f..000000000000 --- 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 index b118459ce902..000000000000 --- 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 index 8c7f4c5653ae..000000000000 --- 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 index 4cb05ce8777f..000000000000 --- 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 index 717f778e4589..000000000000 --- 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 index 8ad7503bb632..000000000000 --- 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 index a3607dbcb5c8..000000000000 --- 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 index 02383cd5f8c4..000000000000 --- 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 index 8100dc41e3dc..000000000000 --- 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 index 07872aa7edfb..000000000000 --- 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 index 6a8edcd56261..000000000000 --- 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 index c87c0bc135b7..000000000000 --- 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 index dbc3a8d9c587..000000000000 --- 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 index e69de29bb2d1..000000000000 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 index 5b6d8978cdc4..000000000000 --- 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 index f1a09304712f..000000000000 --- 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 index bd91e2c9f653..000000000000 --- 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 index 23740967edf7..000000000000 --- 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 index fb754ed0ce77..000000000000 --- 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 index 3a0ac71c8af5..000000000000 --- 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 index e69de29bb2d1..000000000000 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 index 89d4b3681a99..000000000000 --- 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 index c98631e2bbdd..000000000000 --- 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 index 68c9d44b7c34..000000000000 --- 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 index 21d4c7520759..000000000000 --- 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 index b6ffb3323d11..000000000000 --- 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 index 5797c2f292a7..000000000000 --- 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 index 3940870fce0f..000000000000 --- 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 index c53e52b0872b..000000000000 --- 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 index c54039766c0b..000000000000 --- 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 index 9e311c946e1a..000000000000 --- 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 index 513890c41c01..000000000000 --- 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 index 5797c2f292a7..000000000000 --- 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 index 28acc466907c..000000000000 --- 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 index 5797c2f292a7..000000000000 --- 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 index 3a0ac71c8af5..000000000000 --- 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 index e69de29bb2d1..000000000000 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 index 01747e420561..000000000000 --- 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 index c676a5582d51..000000000000 --- 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 index 637b7a8be975..000000000000 --- 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 index e3e332c4f228..000000000000 --- 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 index 78e14e9472a4..000000000000 --- 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 index dbcd013b3f0e..000000000000 --- 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 index b091ecc20906..000000000000 --- 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 index e89d1f5534c5..000000000000 --- 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 index bb34346801c6..000000000000 --- 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 index 78e14e9472a4..000000000000 --- 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 index dbcd013b3f0e..000000000000 --- 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 index 9b9f1f2e675d..000000000000 --- 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 index aa82d973ae17..000000000000 --- 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 index e69de29bb2d1..000000000000 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 index 01747e420561..000000000000 --- 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 index b259af97269f..000000000000 --- 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 index 66526582579d..000000000000 --- 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 index 7ec655c8ccfc..000000000000 --- 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 index e3e332c4f228..000000000000 --- 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 index d21800684d33..000000000000 --- 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 index 78e14e9472a4..000000000000 --- 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 index e8fe288f657d..000000000000 --- 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 index b091ecc20906..000000000000 --- 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 index c54039766c0b..000000000000 --- 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 index e473f31862db..000000000000 --- 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 index d21800684d33..000000000000 --- 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 index 78e14e9472a4..000000000000 --- 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 index dbcd013b3f0e..000000000000 --- 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 index 29a4be13fb61..000000000000 --- 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 index c54039766c0b..000000000000 --- 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 index e69de29bb2d1..000000000000 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 index 01747e420561..000000000000 --- 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 index c676a5582d51..000000000000 --- 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 index 9123db83bbbd..000000000000 --- 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 index e3e332c4f228..000000000000 --- 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 index 78e14e9472a4..000000000000 --- 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 index dbcd013b3f0e..000000000000 --- 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 index bbcde3e15591..000000000000 --- 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 index c8079e3dcdbe..000000000000 --- 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 index bb34346801c6..000000000000 --- 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 index 78e14e9472a4..000000000000 --- 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 index dbcd013b3f0e..000000000000 --- 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 index ae44a8738298..000000000000 --- 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 index 5c6df6e38dd8..000000000000 --- 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 index e69de29bb2d1..000000000000 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 index cd071f9cff45..000000000000 --- 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 index 9123db83bbbd..000000000000 --- 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 index e3e332c4f228..000000000000 --- 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 index 31a79e45938c..000000000000 --- 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 index e8fe288f657d..000000000000 --- 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 index bbcde3e15591..000000000000 --- 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 index c8079e3dcdbe..000000000000 --- 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 index 364ef25f31c1..000000000000 --- 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 index 737a821f7760..000000000000 --- 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 index e473f31862db..000000000000 --- 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 index 31a79e45938c..000000000000 --- 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 index e8fe288f657d..000000000000 --- 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 index e29788766b68..000000000000 --- 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 index e69de29bb2d1..000000000000 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 index 01747e420561..000000000000 --- 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 index ca81c710bd19..000000000000 --- 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 index 7397ae6873e1..000000000000 --- 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 index e3e332c4f228..000000000000 --- 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 index 86665905d677..000000000000 --- 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 index 425cf6082a3b..000000000000 --- 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 index d3166f117dad..000000000000 --- 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 index 6506960f73a3..000000000000 --- 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 index 45e2fc9cc308..000000000000 --- 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 index bb34346801c6..000000000000 --- 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 index 86665905d677..000000000000 --- 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 index 425cf6082a3b..000000000000 --- 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 index d3166f117dad..000000000000 --- 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 index 573cffbc30a1..000000000000 --- 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 index 45e2fc9cc308..000000000000 --- 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 index e69de29bb2d1..000000000000 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 index 8b1ebbe2c361..000000000000 --- 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 index d3166f117dad..000000000000 --- 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 index 8020d793c37f..000000000000 --- 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 index 45e2fc9cc308..000000000000 --- 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 index e3e332c4f228..000000000000 --- 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 index ea8a58ccdae6..000000000000 --- 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 index f9606ef70cc4..000000000000 --- 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 index d3166f117dad..000000000000 --- 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 index 6506960f73a3..000000000000 --- 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 index 45e2fc9cc308..000000000000 --- 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 index e473f31862db..000000000000 --- 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 index ea8a58ccdae6..000000000000 --- 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 index f9606ef70cc4..000000000000 --- 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 index d3166f117dad..000000000000 --- 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 index cc9675c2adec..000000000000 --- 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 index 45e2fc9cc308..000000000000 --- 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 index e69de29bb2d1..000000000000 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 index 01747e420561..000000000000 --- 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 index d99595e47de7..000000000000 --- 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 index edf71708b6d7..000000000000 --- 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 index e473f31862db..000000000000 --- 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 index 4290b2b9f982..000000000000 --- 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 index 3f54d542976f..000000000000 --- 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 index 3a0ac71c8af5..000000000000 --- 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 index e69de29bb2d1..000000000000 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 index 01747e420561..000000000000 --- 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 index c98631e2bbdd..000000000000 --- 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 index 9c5c2c71786a..000000000000 --- 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 index e473f31862db..000000000000 --- 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 index 78e14e9472a4..000000000000 --- 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 index 58d439c7da99..000000000000 --- 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 index 02383cd5f8c4..000000000000 --- 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 index 8100dc41e3dc..000000000000 --- 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 index 07872aa7edfb..000000000000 --- 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 index 6a8edcd56261..000000000000 --- 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 index 5225495834aa..000000000000 --- 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 index c87c0bc135b7..000000000000 --- 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 index dbc3a8d9c587..000000000000 --- 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 index e69de29bb2d1..000000000000 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 index 01747e420561..000000000000 --- 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 index c98631e2bbdd..000000000000 --- 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 index 364ef25f31c1..000000000000 --- 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 index e473f31862db..000000000000 --- 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 index e8fe288f657d..000000000000 --- 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 index 19b5bd3b557f..000000000000 --- 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 index 3a0ac71c8af5..000000000000 --- 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 index e69de29bb2d1..000000000000 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 index 01747e420561..000000000000 --- 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 index fe05a61ff31e..000000000000 --- 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 index 6e7449ebcd84..000000000000 --- 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 index e473f31862db..000000000000 --- 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 index f9606ef70cc4..000000000000 --- 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 index 573cffbc30a1..000000000000 --- 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 index 3a0ac71c8af5..000000000000 --- a/suites/upgrade/old/small/rgw/distro +++ /dev/null @@ -1 +0,0 @@ -../rados/distro \ No newline at end of file