From: Sage Weil Date: Thu, 3 Nov 2016 16:06:19 +0000 (-0400) Subject: upgrade/firefly-hammer-x: remove X-Git-Tag: v11.1.1~58^2^2~57^2~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dfa6ff06a8337df56029180bc9daa4c7e849fdef;p=ceph.git upgrade/firefly-hammer-x: remove Signed-off-by: Sage Weil --- diff --git a/suites/upgrade/firefly-hammer-x/parallel/% b/suites/upgrade/firefly-hammer-x/parallel/% deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/suites/upgrade/firefly-hammer-x/parallel/0-cluster/start.yaml b/suites/upgrade/firefly-hammer-x/parallel/0-cluster/start.yaml deleted file mode 100644 index 3eb17b675f30..000000000000 --- a/suites/upgrade/firefly-hammer-x/parallel/0-cluster/start.yaml +++ /dev/null @@ -1,21 +0,0 @@ -overrides: - ceph: - conf: - mon: - mon warn on legacy crush tunables: false - mon debug unsafe allow tier with nonempty snaps: true - log-whitelist: - - scrub mismatch - - ScrubResult - - failed to encode map -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/firefly-hammer-x/parallel/1-firelfy-hammer-install/firefly-hammer.yaml b/suites/upgrade/firefly-hammer-x/parallel/1-firelfy-hammer-install/firefly-hammer.yaml deleted file mode 100644 index 94c54df518c3..000000000000 --- a/suites/upgrade/firefly-hammer-x/parallel/1-firelfy-hammer-install/firefly-hammer.yaml +++ /dev/null @@ -1,14 +0,0 @@ -tasks: -- install: - branch: firefly -- print: "**** done firefly install" -- ceph: - fs: xfs -- parallel: - - workload - - upgrade-sequence -- print: "**** done parallel" -- install.upgrade: - client.0: - branch: hammer -- print: "*** client.0 upgraded to hammer" diff --git a/suites/upgrade/firefly-hammer-x/parallel/2-workload/+ b/suites/upgrade/firefly-hammer-x/parallel/2-workload/+ deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/suites/upgrade/firefly-hammer-x/parallel/2-workload/rados_api.yaml b/suites/upgrade/firefly-hammer-x/parallel/2-workload/rados_api.yaml deleted file mode 100644 index fb53cb472a2d..000000000000 --- a/suites/upgrade/firefly-hammer-x/parallel/2-workload/rados_api.yaml +++ /dev/null @@ -1,9 +0,0 @@ -workload: - sequential: - - workunit: - branch: firefly - clients: - client.0: - - rados/test-upgrade-v9.0.1.sh - - cls - - print: "**** done 2-workload/rados_api.yaml" diff --git a/suites/upgrade/firefly-hammer-x/parallel/2-workload/rados_loadgenbig.yaml b/suites/upgrade/firefly-hammer-x/parallel/2-workload/rados_loadgenbig.yaml deleted file mode 100644 index 2c8570e4128f..000000000000 --- a/suites/upgrade/firefly-hammer-x/parallel/2-workload/rados_loadgenbig.yaml +++ /dev/null @@ -1,8 +0,0 @@ -workload: - sequential: - - workunit: - branch: firefly - clients: - client.0: - - rados/load-gen-big.sh - - print: "**** done rados/load-gen-big.sh" diff --git a/suites/upgrade/firefly-hammer-x/parallel/2-workload/test_rbd_api.yaml b/suites/upgrade/firefly-hammer-x/parallel/2-workload/test_rbd_api.yaml deleted file mode 100644 index c48f5cbb06c0..000000000000 --- a/suites/upgrade/firefly-hammer-x/parallel/2-workload/test_rbd_api.yaml +++ /dev/null @@ -1,8 +0,0 @@ -workload: - sequential: - - workunit: - branch: firefly - clients: - client.0: - - rbd/test_librbd.sh - - print: "**** done rbd/test_librbd.sh" diff --git a/suites/upgrade/firefly-hammer-x/parallel/2-workload/test_rbd_python.yaml b/suites/upgrade/firefly-hammer-x/parallel/2-workload/test_rbd_python.yaml deleted file mode 100644 index 49c6237cff10..000000000000 --- a/suites/upgrade/firefly-hammer-x/parallel/2-workload/test_rbd_python.yaml +++ /dev/null @@ -1,8 +0,0 @@ -workload: - sequential: - - workunit: - branch: firefly - clients: - client.0: - - rbd/test_librbd_python.sh - - print: "**** done rbd/test_librbd_python.sh" diff --git a/suites/upgrade/firefly-hammer-x/parallel/3-upgrade-sequence/upgrade-all.yaml b/suites/upgrade/firefly-hammer-x/parallel/3-upgrade-sequence/upgrade-all.yaml deleted file mode 100644 index 54a0a3c4a5f0..000000000000 --- a/suites/upgrade/firefly-hammer-x/parallel/3-upgrade-sequence/upgrade-all.yaml +++ /dev/null @@ -1,10 +0,0 @@ -upgrade-sequence: - sequential: - - install.upgrade: - mon.a: - branch: hammer - mon.b: - branch: hammer - - print: "**** done install.upgrade mon.a & mon.b to branch: hammer" - - ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3] - - print: "**** done ceph.restart all" diff --git a/suites/upgrade/firefly-hammer-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/firefly-hammer-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml deleted file mode 100644 index 84dca414b0b0..000000000000 --- a/suites/upgrade/firefly-hammer-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml +++ /dev/null @@ -1,39 +0,0 @@ -upgrade-sequence: - sequential: - - install.upgrade: - mon.a: - branch: hammer - - print: "**** done install.upgrade mon.a to branch: hammer" - - ceph.restart: - daemons: [mon.a] - wait-for-healthy: true - - sleep: - duration: 60 - - ceph.restart: - daemons: [osd.0, osd.1] - wait-for-healthy: true - - sleep: - duration: 60 - - ceph.restart: [mds.a] - - sleep: - duration: 60 - - print: "**** done ceph.restart [mon.a] [osd.0, osd.1] [mds.a]" - - exec: - mon.b: - # is this command valid? - - sudo ceph osd crush tunables firefly - - install.upgrade: - mon.b: - branch: hammer - - print: "**** done install.upgrade mon.b to branch: hammer" - - ceph.restart: - daemons: [mon.b, mon.c] - wait-for-healthy: true - - sleep: - duration: 60 - - ceph.restart: - daemons: [osd.2, osd.3] - wait-for-healthy: true - - sleep: - duration: 60 - - print: "**** done ceph.restart [mon.b, mon.c] [osd.2, osd.3]" diff --git a/suites/upgrade/firefly-hammer-x/parallel/4-firefly-hammer-x-upgrade/firefly-hammer-x.yaml b/suites/upgrade/firefly-hammer-x/parallel/4-firefly-hammer-x-upgrade/firefly-hammer-x.yaml deleted file mode 100644 index 37a880b52b47..000000000000 --- a/suites/upgrade/firefly-hammer-x/parallel/4-firefly-hammer-x-upgrade/firefly-hammer-x.yaml +++ /dev/null @@ -1,8 +0,0 @@ -tasks: - - parallel: - - workload2 - - upgrade-sequence2 - - print: "**** done parallel workload2 and upgrade-sequence2" - - install.upgrade: - client.0: - - print: "**** done install.upgrade client.0 to the version from teuthology-suite arg" diff --git a/suites/upgrade/firefly-hammer-x/parallel/5-workload/+ b/suites/upgrade/firefly-hammer-x/parallel/5-workload/+ deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/suites/upgrade/firefly-hammer-x/parallel/5-workload/rados_api.yaml b/suites/upgrade/firefly-hammer-x/parallel/5-workload/rados_api.yaml deleted file mode 100644 index 70249b9ed863..000000000000 --- a/suites/upgrade/firefly-hammer-x/parallel/5-workload/rados_api.yaml +++ /dev/null @@ -1,13 +0,0 @@ -overrides: - ceph: - log-whitelist: - - reached quota -workload2: - sequential: - - workunit: - branch: hammer - clients: - client.0: - - rados/test-upgrade-v9.0.1.sh - - cls - - print: "**** done rados/test.sh and cls from 5-workload/rados_api.yaml" diff --git a/suites/upgrade/firefly-hammer-x/parallel/5-workload/rados_loadgenbig.yaml b/suites/upgrade/firefly-hammer-x/parallel/5-workload/rados_loadgenbig.yaml deleted file mode 100644 index 0f4d779fe117..000000000000 --- a/suites/upgrade/firefly-hammer-x/parallel/5-workload/rados_loadgenbig.yaml +++ /dev/null @@ -1,8 +0,0 @@ -workload2: - sequential: - - workunit: - branch: hammer - clients: - client.0: - - rados/load-gen-big.sh - - print: "**** done rados/load-gen-big.sh 2" diff --git a/suites/upgrade/firefly-hammer-x/parallel/5-workload/test_rbd_api.yaml b/suites/upgrade/firefly-hammer-x/parallel/5-workload/test_rbd_api.yaml deleted file mode 100644 index 264bfece4448..000000000000 --- a/suites/upgrade/firefly-hammer-x/parallel/5-workload/test_rbd_api.yaml +++ /dev/null @@ -1,8 +0,0 @@ -workload2: - sequential: - - workunit: - branch: hammer - clients: - client.0: - - rbd/test_librbd.sh - - print: "**** done rbd/test_librbd.sh 2" diff --git a/suites/upgrade/firefly-hammer-x/parallel/5-workload/test_rbd_python.yaml b/suites/upgrade/firefly-hammer-x/parallel/5-workload/test_rbd_python.yaml deleted file mode 100644 index b71f35da28d1..000000000000 --- a/suites/upgrade/firefly-hammer-x/parallel/5-workload/test_rbd_python.yaml +++ /dev/null @@ -1,8 +0,0 @@ -workload2: - sequential: - - workunit: - branch: hammer - clients: - client.0: - - rbd/test_librbd_python.sh - - print: "**** done rbd/test_librbd_python.sh 2" diff --git a/suites/upgrade/firefly-hammer-x/parallel/6-upgrade-sequence/upgrade-all.yaml b/suites/upgrade/firefly-hammer-x/parallel/6-upgrade-sequence/upgrade-all.yaml deleted file mode 100644 index 8350d74d15f2..000000000000 --- a/suites/upgrade/firefly-hammer-x/parallel/6-upgrade-sequence/upgrade-all.yaml +++ /dev/null @@ -1,8 +0,0 @@ -upgrade-sequence2: - sequential: - - install.upgrade: - mon.a: - mon.b: - - print: "**** done install.upgrade mon.a and mon.b" - - ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3] - - print: "**** done ceph.restart all" diff --git a/suites/upgrade/firefly-hammer-x/parallel/6-upgrade-sequence/upgrade-by-daemon.yaml b/suites/upgrade/firefly-hammer-x/parallel/6-upgrade-sequence/upgrade-by-daemon.yaml deleted file mode 100644 index d953c63e67c8..000000000000 --- a/suites/upgrade/firefly-hammer-x/parallel/6-upgrade-sequence/upgrade-by-daemon.yaml +++ /dev/null @@ -1,35 +0,0 @@ -upgrade-sequence2: - sequential: - - install.upgrade: - mon.a: - - print: "**** done install.upgrade mon.a to the version from teuthology-suite arg" - - ceph.restart: - daemons: [mon.a] - wait-for-healthy: true - - sleep: - duration: 60 - - ceph.restart: - daemons: [osd.0, osd.1] - wait-for-healthy: true - - sleep: - duration: 60 - - ceph.restart: [mds.a] - - sleep: - duration: 60 - - print: "**** running mixed versions of osds and mons" - - exec: - mon.b: - - sudo ceph osd crush tunables hammer - - install.upgrade: - mon.b: - - print: "**** done install.upgrade mon.b to the version from teuthology-suite arg" - - ceph.restart: - daemons: [mon.b, mon.c] - wait-for-healthy: true - - sleep: - duration: 60 - - ceph.restart: - daemons: [osd.2, osd.3] - wait-for-healthy: true - - sleep: - duration: 60 diff --git a/suites/upgrade/firefly-hammer-x/parallel/7-final-workload/+ b/suites/upgrade/firefly-hammer-x/parallel/7-final-workload/+ deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/suites/upgrade/firefly-hammer-x/parallel/7-final-workload/ec-rados-plugin=jerasure-k=2-m=1.yaml b/suites/upgrade/firefly-hammer-x/parallel/7-final-workload/ec-rados-plugin=jerasure-k=2-m=1.yaml deleted file mode 120000 index 4baff9bdd2f2..000000000000 --- a/suites/upgrade/firefly-hammer-x/parallel/7-final-workload/ec-rados-plugin=jerasure-k=2-m=1.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../../erasure-code/ec-rados-plugin=jerasure-k=2-m=1.yaml \ No newline at end of file diff --git a/suites/upgrade/firefly-hammer-x/parallel/7-final-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml b/suites/upgrade/firefly-hammer-x/parallel/7-final-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml deleted file mode 120000 index 4b9d9a44a245..000000000000 --- a/suites/upgrade/firefly-hammer-x/parallel/7-final-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../../erasure-code/ec-rados-plugin=jerasure-k=3-m=1.yaml \ No newline at end of file diff --git a/suites/upgrade/firefly-hammer-x/parallel/7-final-workload/rados-snaps-few-objects.yaml b/suites/upgrade/firefly-hammer-x/parallel/7-final-workload/rados-snaps-few-objects.yaml deleted file mode 100644 index e0b0ba1370d4..000000000000 --- a/suites/upgrade/firefly-hammer-x/parallel/7-final-workload/rados-snaps-few-objects.yaml +++ /dev/null @@ -1,13 +0,0 @@ -tasks: -- rados: - clients: [client.1] - ops: 4000 - objects: 50 - op_weights: - read: 100 - write: 100 - delete: 50 - snap_create: 50 - snap_remove: 50 - rollback: 50 -- print: "**** done 7-final-workload/rados-snaps-few-objects.yaml" diff --git a/suites/upgrade/firefly-hammer-x/parallel/7-final-workload/rados_loadgenmix.yaml b/suites/upgrade/firefly-hammer-x/parallel/7-final-workload/rados_loadgenmix.yaml deleted file mode 100644 index b1c67910e089..000000000000 --- a/suites/upgrade/firefly-hammer-x/parallel/7-final-workload/rados_loadgenmix.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: - - workunit: - clients: - client.1: - - rados/load-gen-mix.sh - - print: "**** done 7-final-workload/rados_loadgenmix.yaml" diff --git a/suites/upgrade/firefly-hammer-x/parallel/7-final-workload/rados_mon_thrash.yaml b/suites/upgrade/firefly-hammer-x/parallel/7-final-workload/rados_mon_thrash.yaml deleted file mode 100644 index 89745a55ba31..000000000000 --- a/suites/upgrade/firefly-hammer-x/parallel/7-final-workload/rados_mon_thrash.yaml +++ /dev/null @@ -1,11 +0,0 @@ -tasks: - - sequential: - - mon_thrash: - revive_delay: 20 - thrash_delay: 1 - - workunit: - branch: hammer - clients: - client.1: - - rados/test-upgrade-v9.0.1.sh - - print: "**** done rados/test-upgrade-v9.0.1.sh - 6-final-workload" diff --git a/suites/upgrade/firefly-hammer-x/parallel/7-final-workload/rbd_cls.yaml b/suites/upgrade/firefly-hammer-x/parallel/7-final-workload/rbd_cls.yaml deleted file mode 100644 index 27b10a3cdc6e..000000000000 --- a/suites/upgrade/firefly-hammer-x/parallel/7-final-workload/rbd_cls.yaml +++ /dev/null @@ -1,7 +0,0 @@ -tasks: -- workunit: - clients: - client.1: - - cls/test_cls_rbd.sh -- print: "**** done 7-final-workload/rbd_cls.yaml" - diff --git a/suites/upgrade/firefly-hammer-x/parallel/7-final-workload/rbd_import_export.yaml b/suites/upgrade/firefly-hammer-x/parallel/7-final-workload/rbd_import_export.yaml deleted file mode 100644 index a7ce2141ee59..000000000000 --- a/suites/upgrade/firefly-hammer-x/parallel/7-final-workload/rbd_import_export.yaml +++ /dev/null @@ -1,7 +0,0 @@ -tasks: -- workunit: - clients: - client.1: - - rbd/import_export.sh - env: - RBD_CREATE_ARGS: --new-format diff --git a/suites/upgrade/firefly-hammer-x/parallel/7-final-workload/rgw_s3tests.yaml b/suites/upgrade/firefly-hammer-x/parallel/7-final-workload/rgw_s3tests.yaml deleted file mode 100644 index a15968b198be..000000000000 --- a/suites/upgrade/firefly-hammer-x/parallel/7-final-workload/rgw_s3tests.yaml +++ /dev/null @@ -1,10 +0,0 @@ -tasks: -- rgw: [client.1] -- s3tests: - client.1: - rgw_server: client.1 -overrides: - ceph: - conf: - client: - rgw lc debug interval: 10 diff --git a/suites/upgrade/firefly-hammer-x/parallel/distros b/suites/upgrade/firefly-hammer-x/parallel/distros deleted file mode 120000 index 79010c36a599..000000000000 --- a/suites/upgrade/firefly-hammer-x/parallel/distros +++ /dev/null @@ -1 +0,0 @@ -../../../../distros/supported \ No newline at end of file diff --git a/suites/upgrade/firefly-hammer-x/stress-split/% b/suites/upgrade/firefly-hammer-x/stress-split/% deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/suites/upgrade/firefly-hammer-x/stress-split/00-cluster/start.yaml b/suites/upgrade/firefly-hammer-x/stress-split/00-cluster/start.yaml deleted file mode 100644 index 129635fa52a9..000000000000 --- a/suites/upgrade/firefly-hammer-x/stress-split/00-cluster/start.yaml +++ /dev/null @@ -1,19 +0,0 @@ -overrides: - ceph: - log-whitelist: - - failed to encode map - conf: - mon: - mon warn on legacy crush tunables: false -roles: -- - mon.a - - mon.b - - mds.a - - osd.0 - - osd.1 - - osd.2 - - mon.c -- - osd.3 - - osd.4 - - osd.5 -- - client.0 diff --git a/suites/upgrade/firefly-hammer-x/stress-split/01-firefly-install/firefly.yaml b/suites/upgrade/firefly-hammer-x/stress-split/01-firefly-install/firefly.yaml deleted file mode 100644 index 44e6420b687e..000000000000 --- a/suites/upgrade/firefly-hammer-x/stress-split/01-firefly-install/firefly.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- install: - branch: firefly -- ceph: - fs: xfs -- print: "**** done install firefly" diff --git a/suites/upgrade/firefly-hammer-x/stress-split/02-partial-upgrade-hammer/firsthalf.yaml b/suites/upgrade/firefly-hammer-x/stress-split/02-partial-upgrade-hammer/firsthalf.yaml deleted file mode 100644 index 5d10882065c1..000000000000 --- a/suites/upgrade/firefly-hammer-x/stress-split/02-partial-upgrade-hammer/firsthalf.yaml +++ /dev/null @@ -1,8 +0,0 @@ -tasks: -- install.upgrade: - osd.0: - branch: hammer -- print: "**** done install.upgrade hammer" -- ceph.restart: - daemons: [osd.0, osd.1, osd.2] -- print: "**** done 02-partial-upgrade-hammer" diff --git a/suites/upgrade/firefly-hammer-x/stress-split/03-workload/rbd.yaml b/suites/upgrade/firefly-hammer-x/stress-split/03-workload/rbd.yaml deleted file mode 100644 index 07541d6b485f..000000000000 --- a/suites/upgrade/firefly-hammer-x/stress-split/03-workload/rbd.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- workunit: - clients: - client.0: - - cls/test_cls_rbd.sh -- print: "**** done 03-workload/rbd.yaml" diff --git a/suites/upgrade/firefly-hammer-x/stress-split/04-mona-upgrade-hammer/mona.yaml b/suites/upgrade/firefly-hammer-x/stress-split/04-mona-upgrade-hammer/mona.yaml deleted file mode 100644 index d3b8556cbb1d..000000000000 --- a/suites/upgrade/firefly-hammer-x/stress-split/04-mona-upgrade-hammer/mona.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- ceph.restart: - daemons: [mon.a] - wait-for-healthy: false - wait-for-osds-up: true -- print: "*** done restart mon.a 04-mona-upgrade-hammer/mona.yaml" diff --git a/suites/upgrade/firefly-hammer-x/stress-split/05-workload/+ b/suites/upgrade/firefly-hammer-x/stress-split/05-workload/+ deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/suites/upgrade/firefly-hammer-x/stress-split/05-workload/rbd-cls.yaml b/suites/upgrade/firefly-hammer-x/stress-split/05-workload/rbd-cls.yaml deleted file mode 100644 index 507c8f992314..000000000000 --- a/suites/upgrade/firefly-hammer-x/stress-split/05-workload/rbd-cls.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- workunit: - clients: - client.0: - - cls/test_cls_rbd.sh -- print: "**** done 05-workload/rbd-cls.yaml" diff --git a/suites/upgrade/firefly-hammer-x/stress-split/05-workload/readwrite.yaml b/suites/upgrade/firefly-hammer-x/stress-split/05-workload/readwrite.yaml deleted file mode 100644 index cacfde1607c2..000000000000 --- a/suites/upgrade/firefly-hammer-x/stress-split/05-workload/readwrite.yaml +++ /dev/null @@ -1,11 +0,0 @@ -tasks: -- rados: - clients: [client.0] - ops: 4000 - objects: 500 - write_append_excl: false - op_weights: - read: 45 - write: 45 - delete: 10 -- print: "**** done 05-workload/readwrite.yaml" diff --git a/suites/upgrade/firefly-hammer-x/stress-split/06-monb-upgrade-hammer/monb.yaml b/suites/upgrade/firefly-hammer-x/stress-split/06-monb-upgrade-hammer/monb.yaml deleted file mode 100644 index f4a6d991ca7b..000000000000 --- a/suites/upgrade/firefly-hammer-x/stress-split/06-monb-upgrade-hammer/monb.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- ceph.restart: - daemons: [mon.b] - wait-for-healthy: false - wait-for-osds-up: true -- print: "**** done restarted mon.b 06-monb-upgrade-hammer/monb.yaml" diff --git a/suites/upgrade/firefly-hammer-x/stress-split/07-workload/+ b/suites/upgrade/firefly-hammer-x/stress-split/07-workload/+ deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/suites/upgrade/firefly-hammer-x/stress-split/07-workload/radosbench.yaml b/suites/upgrade/firefly-hammer-x/stress-split/07-workload/radosbench.yaml deleted file mode 100644 index 7f10f7a69b26..000000000000 --- a/suites/upgrade/firefly-hammer-x/stress-split/07-workload/radosbench.yaml +++ /dev/null @@ -1,33 +0,0 @@ -tasks: -- full_sequential: - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 -- print: "**** done 07-workload/radosbench.yaml" diff --git a/suites/upgrade/firefly-hammer-x/stress-split/07-workload/rbd_api.yaml b/suites/upgrade/firefly-hammer-x/stress-split/07-workload/rbd_api.yaml deleted file mode 100644 index 68f074ec6f98..000000000000 --- a/suites/upgrade/firefly-hammer-x/stress-split/07-workload/rbd_api.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- workunit: - clients: - client.0: - - rbd/test_librbd.sh -- print: "**** done 07-workload/rbd_api.yaml" diff --git a/suites/upgrade/firefly-hammer-x/stress-split/08-monc-upgrade-hammer/monc.yaml b/suites/upgrade/firefly-hammer-x/stress-split/08-monc-upgrade-hammer/monc.yaml deleted file mode 100644 index 6f2ba5ec177e..000000000000 --- a/suites/upgrade/firefly-hammer-x/stress-split/08-monc-upgrade-hammer/monc.yaml +++ /dev/null @@ -1,8 +0,0 @@ -tasks: -- ceph.restart: - daemons: [mon.c] - wait-for-healthy: false - wait-for-osds-up: true -- print: "**** done ceph.restart mon.c" -- ceph.wait_for_mon_quorum: [a, b, c] -- print: "**** done 08-monc-upgrade-hammer/monc.yaml" diff --git a/suites/upgrade/firefly-hammer-x/stress-split/09-workload/rbd-python.yaml b/suites/upgrade/firefly-hammer-x/stress-split/09-workload/rbd-python.yaml deleted file mode 100644 index bd79dc1450cd..000000000000 --- a/suites/upgrade/firefly-hammer-x/stress-split/09-workload/rbd-python.yaml +++ /dev/null @@ -1,8 +0,0 @@ -tasks: -- workunit: - #fixes #10577 - branch: firefly - clients: - client.0: - - rbd/test_librbd_python.sh -- print: "**** done 09-workload/rbd-python.yaml" diff --git a/suites/upgrade/firefly-hammer-x/stress-split/10-osds-upgrade-hammer/secondhalf.yaml b/suites/upgrade/firefly-hammer-x/stress-split/10-osds-upgrade-hammer/secondhalf.yaml deleted file mode 100644 index 75e49a70da45..000000000000 --- a/suites/upgrade/firefly-hammer-x/stress-split/10-osds-upgrade-hammer/secondhalf.yaml +++ /dev/null @@ -1,8 +0,0 @@ -tasks: -- install.upgrade: - osd.3: - branch: hammer -- print: "**** done install.upgrade hammer" -- ceph.restart: - daemons: [osd.3, osd.4, osd.5] -- print: "**** done 10-osds-upgrade-hammer/secondhalf.yaml" diff --git a/suites/upgrade/firefly-hammer-x/stress-split/11-workload/snaps-few-objects.yaml b/suites/upgrade/firefly-hammer-x/stress-split/11-workload/snaps-few-objects.yaml deleted file mode 100644 index b9f02711540f..000000000000 --- a/suites/upgrade/firefly-hammer-x/stress-split/11-workload/snaps-few-objects.yaml +++ /dev/null @@ -1,14 +0,0 @@ -tasks: -- rados: - clients: [client.0] - ops: 4000 - objects: 50 - write_append_excl: false - op_weights: - read: 100 - write: 100 - delete: 50 - snap_create: 50 - snap_remove: 50 - rollback: 50 -- print: "**** done 11-workload/snaps-few-objects.yaml" diff --git a/suites/upgrade/firefly-hammer-x/stress-split/12-partial-upgrade-x/first.yaml b/suites/upgrade/firefly-hammer-x/stress-split/12-partial-upgrade-x/first.yaml deleted file mode 100644 index ff690bad7a1d..000000000000 --- a/suites/upgrade/firefly-hammer-x/stress-split/12-partial-upgrade-x/first.yaml +++ /dev/null @@ -1,7 +0,0 @@ -tasks: -- install.upgrade: - osd.0: -- print: "**** done install.upgrade -x osd.0" -- ceph.restart: - daemons: [osd.0, osd.1, osd.2] -- print: "**** done 12-partial-upgrade-x/first.yaml" diff --git a/suites/upgrade/firefly-hammer-x/stress-split/13-workload/rados_loadgen_big.yaml b/suites/upgrade/firefly-hammer-x/stress-split/13-workload/rados_loadgen_big.yaml deleted file mode 100644 index 90698cb30e3d..000000000000 --- a/suites/upgrade/firefly-hammer-x/stress-split/13-workload/rados_loadgen_big.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- workunit: - clients: - client.0: - - rados/load-gen-big.sh -- print: "**** done 13-workload/rados_loadgen_big.yaml" diff --git a/suites/upgrade/firefly-hammer-x/stress-split/14-mona-upgrade-x/mona.yaml b/suites/upgrade/firefly-hammer-x/stress-split/14-mona-upgrade-x/mona.yaml deleted file mode 100644 index d83162c8b736..000000000000 --- a/suites/upgrade/firefly-hammer-x/stress-split/14-mona-upgrade-x/mona.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- ceph.restart: - daemons: [mon.a] - wait-for-healthy: false - wait-for-osds-up: true -- print: "**** done ceph.restart mon.a 14-mona-upgrade-x/mona.yaml" diff --git a/suites/upgrade/firefly-hammer-x/stress-split/15-workload/rbd-import-export.yaml b/suites/upgrade/firefly-hammer-x/stress-split/15-workload/rbd-import-export.yaml deleted file mode 100644 index 7e6d43bff070..000000000000 --- a/suites/upgrade/firefly-hammer-x/stress-split/15-workload/rbd-import-export.yaml +++ /dev/null @@ -1,8 +0,0 @@ -tasks: -- workunit: - clients: - client.0: - - rbd/import_export.sh - env: - RBD_CREATE_ARGS: --new-format -- print: "**** done 15-workload/rbd-import-export.yaml" diff --git a/suites/upgrade/firefly-hammer-x/stress-split/16-monb-upgrade-x/monb.yaml b/suites/upgrade/firefly-hammer-x/stress-split/16-monb-upgrade-x/monb.yaml deleted file mode 100644 index 91234034eb3e..000000000000 --- a/suites/upgrade/firefly-hammer-x/stress-split/16-monb-upgrade-x/monb.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- ceph.restart: - daemons: [mon.b] - wait-for-healthy: false - wait-for-osds-up: true -- print: "**** done ceph.restart mon.b 16-monb-upgrade-x/monb.yaml" diff --git a/suites/upgrade/firefly-hammer-x/stress-split/17-workload/readwrite.yaml b/suites/upgrade/firefly-hammer-x/stress-split/17-workload/readwrite.yaml deleted file mode 100644 index ee49512c42c6..000000000000 --- a/suites/upgrade/firefly-hammer-x/stress-split/17-workload/readwrite.yaml +++ /dev/null @@ -1,11 +0,0 @@ -tasks: -- rados: - clients: [client.0] - ops: 4000 - objects: 500 - write_append_excl: false - op_weights: - read: 45 - write: 45 - delete: 10 -- print: "**** done 17-workload/readwrite.yaml" diff --git a/suites/upgrade/firefly-hammer-x/stress-split/18-monc-upgrade-x/monc.yaml b/suites/upgrade/firefly-hammer-x/stress-split/18-monc-upgrade-x/monc.yaml deleted file mode 100644 index f708237d63e1..000000000000 --- a/suites/upgrade/firefly-hammer-x/stress-split/18-monc-upgrade-x/monc.yaml +++ /dev/null @@ -1,8 +0,0 @@ -tasks: -- ceph.restart: - daemons: [mon.c] - wait-for-healthy: false - wait-for-osds-up: true -- print: "**** done ceph.restart mon.c" -- ceph.wait_for_mon_quorum: [a, b, c] -- print: "**** done 18-monc-upgrade-x/monc.yaml" diff --git a/suites/upgrade/firefly-hammer-x/stress-split/19-workload/radosbench.yaml b/suites/upgrade/firefly-hammer-x/stress-split/19-workload/radosbench.yaml deleted file mode 100644 index d51088d8356a..000000000000 --- a/suites/upgrade/firefly-hammer-x/stress-split/19-workload/radosbench.yaml +++ /dev/null @@ -1,33 +0,0 @@ -tasks: -- full_sequential: - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 -- print: "**** done 19-workload/radosbench.yaml" diff --git a/suites/upgrade/firefly-hammer-x/stress-split/20-osds-upgrade-x/osds_secondhalf.yaml b/suites/upgrade/firefly-hammer-x/stress-split/20-osds-upgrade-x/osds_secondhalf.yaml deleted file mode 100644 index cf23816f69bd..000000000000 --- a/suites/upgrade/firefly-hammer-x/stress-split/20-osds-upgrade-x/osds_secondhalf.yaml +++ /dev/null @@ -1,7 +0,0 @@ -tasks: -- install.upgrade: - osd.3: -- print: "**** done install.upgrade osd.3" -- ceph.restart: - daemons: [osd.3, osd.4, osd.5] -- print: "**** done 20-osds-upgrade-x/osds_secondhalf.yaml" diff --git a/suites/upgrade/firefly-hammer-x/stress-split/21-final-workload/+ b/suites/upgrade/firefly-hammer-x/stress-split/21-final-workload/+ deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/suites/upgrade/firefly-hammer-x/stress-split/21-final-workload/rados_stress_watch.yaml b/suites/upgrade/firefly-hammer-x/stress-split/21-final-workload/rados_stress_watch.yaml deleted file mode 100644 index 0e1ba010c5b4..000000000000 --- a/suites/upgrade/firefly-hammer-x/stress-split/21-final-workload/rados_stress_watch.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tasks: -- workunit: - clients: - client.0: - - rados/stress_watch.sh diff --git a/suites/upgrade/firefly-hammer-x/stress-split/21-final-workload/rbd_cls_tests.yaml b/suites/upgrade/firefly-hammer-x/stress-split/21-final-workload/rbd_cls_tests.yaml deleted file mode 100644 index 9ccd57c4a82a..000000000000 --- a/suites/upgrade/firefly-hammer-x/stress-split/21-final-workload/rbd_cls_tests.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tasks: -- workunit: - clients: - client.0: - - cls/test_cls_rbd.sh diff --git a/suites/upgrade/firefly-hammer-x/stress-split/21-final-workload/rgw-swift.yaml b/suites/upgrade/firefly-hammer-x/stress-split/21-final-workload/rgw-swift.yaml deleted file mode 100644 index 0d79fb621ea9..000000000000 --- a/suites/upgrade/firefly-hammer-x/stress-split/21-final-workload/rgw-swift.yaml +++ /dev/null @@ -1,8 +0,0 @@ -tasks: -- rgw: - client.0: - default_idle_timeout: 300 -- swift: - client.0: - rgw_server: client.0 - diff --git a/suites/upgrade/firefly-hammer-x/stress-split/distros b/suites/upgrade/firefly-hammer-x/stress-split/distros deleted file mode 120000 index 79010c36a599..000000000000 --- a/suites/upgrade/firefly-hammer-x/stress-split/distros +++ /dev/null @@ -1 +0,0 @@ -../../../../distros/supported \ No newline at end of file