From: Sage Weil Date: Sat, 26 Mar 2016 13:22:09 +0000 (-0400) Subject: suites/upgrade: remove obsolete *-x suites X-Git-Tag: v10.2.6~165^2^2~131^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1686a202ea43a293673b8c6d8b46ceee7625ab55;p=ceph.git suites/upgrade: remove obsolete *-x suites These versions can no longer upgrade to jewel. Signed-off-by: Sage Weil --- diff --git a/suites/upgrade/dumpling-emperor-x/parallel/% b/suites/upgrade/dumpling-emperor-x/parallel/% deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/suites/upgrade/dumpling-emperor-x/parallel/0-cluster/start.yaml b/suites/upgrade/dumpling-emperor-x/parallel/0-cluster/start.yaml deleted file mode 100644 index e3d7f85f9ffad..0000000000000 --- a/suites/upgrade/dumpling-emperor-x/parallel/0-cluster/start.yaml +++ /dev/null @@ -1,19 +0,0 @@ -overrides: - ceph: - conf: - mon: - mon warn on legacy crush tunables: false - log-whitelist: - - scrub mismatch - - ScrubResult -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/dumpling-emperor-x/parallel/1-dumpling-install/dumpling.yaml b/suites/upgrade/dumpling-emperor-x/parallel/1-dumpling-install/dumpling.yaml deleted file mode 100644 index 92df8cebc5f44..0000000000000 --- a/suites/upgrade/dumpling-emperor-x/parallel/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/dumpling-emperor-x/parallel/2-workload/+ b/suites/upgrade/dumpling-emperor-x/parallel/2-workload/+ deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/suites/upgrade/dumpling-emperor-x/parallel/2-workload/rados_api.yaml b/suites/upgrade/dumpling-emperor-x/parallel/2-workload/rados_api.yaml deleted file mode 100644 index 96d656e493222..0000000000000 --- a/suites/upgrade/dumpling-emperor-x/parallel/2-workload/rados_api.yaml +++ /dev/null @@ -1,8 +0,0 @@ -workload: - sequential: - - workunit: - branch: dumpling - clients: - client.0: - - rados/test.sh - - cls diff --git a/suites/upgrade/dumpling-emperor-x/parallel/2-workload/rados_loadgenbig.yaml b/suites/upgrade/dumpling-emperor-x/parallel/2-workload/rados_loadgenbig.yaml deleted file mode 100644 index 16241b3bed642..0000000000000 --- a/suites/upgrade/dumpling-emperor-x/parallel/2-workload/rados_loadgenbig.yaml +++ /dev/null @@ -1,7 +0,0 @@ -workload: - sequential: - - workunit: - branch: dumpling - clients: - client.0: - - rados/load-gen-big.sh diff --git a/suites/upgrade/dumpling-emperor-x/parallel/2-workload/test_rbd_api.yaml b/suites/upgrade/dumpling-emperor-x/parallel/2-workload/test_rbd_api.yaml deleted file mode 100644 index 7584f0e1ff087..0000000000000 --- a/suites/upgrade/dumpling-emperor-x/parallel/2-workload/test_rbd_api.yaml +++ /dev/null @@ -1,7 +0,0 @@ -workload: - sequential: - - workunit: - branch: dumpling - clients: - client.0: - - rbd/test_librbd.sh diff --git a/suites/upgrade/dumpling-emperor-x/parallel/2-workload/test_rbd_python.yaml b/suites/upgrade/dumpling-emperor-x/parallel/2-workload/test_rbd_python.yaml deleted file mode 100644 index 09c5326592bd2..0000000000000 --- a/suites/upgrade/dumpling-emperor-x/parallel/2-workload/test_rbd_python.yaml +++ /dev/null @@ -1,7 +0,0 @@ -workload: - sequential: - - workunit: - branch: dumpling - clients: - client.0: - - rbd/test_librbd_python.sh diff --git a/suites/upgrade/dumpling-emperor-x/parallel/3-emperor-upgrade/emperor.yaml b/suites/upgrade/dumpling-emperor-x/parallel/3-emperor-upgrade/emperor.yaml deleted file mode 100644 index 626bc161cbd3f..0000000000000 --- a/suites/upgrade/dumpling-emperor-x/parallel/3-emperor-upgrade/emperor.yaml +++ /dev/null @@ -1,10 +0,0 @@ -tasks: - - install.upgrade: - mon.a: - branch: emperor - mon.b: - branch: emperor - - ceph.restart: - - parallel: - - workload2 - - upgrade-sequence diff --git a/suites/upgrade/dumpling-emperor-x/parallel/4-workload/+ b/suites/upgrade/dumpling-emperor-x/parallel/4-workload/+ deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/suites/upgrade/dumpling-emperor-x/parallel/4-workload/rados_api.yaml b/suites/upgrade/dumpling-emperor-x/parallel/4-workload/rados_api.yaml deleted file mode 100644 index b6bb42048a442..0000000000000 --- a/suites/upgrade/dumpling-emperor-x/parallel/4-workload/rados_api.yaml +++ /dev/null @@ -1,8 +0,0 @@ -workload2: - sequential: - - workunit: - branch: dumpling - clients: - client.0: - - rados/test.sh - - cls diff --git a/suites/upgrade/dumpling-emperor-x/parallel/4-workload/rados_loadgenbig.yaml b/suites/upgrade/dumpling-emperor-x/parallel/4-workload/rados_loadgenbig.yaml deleted file mode 100644 index fd5c31dc4775d..0000000000000 --- a/suites/upgrade/dumpling-emperor-x/parallel/4-workload/rados_loadgenbig.yaml +++ /dev/null @@ -1,7 +0,0 @@ -workload2: - sequential: - - workunit: - branch: dumpling - clients: - client.0: - - rados/load-gen-big.sh diff --git a/suites/upgrade/dumpling-emperor-x/parallel/4-workload/test_rbd_api.yaml b/suites/upgrade/dumpling-emperor-x/parallel/4-workload/test_rbd_api.yaml deleted file mode 100644 index 8c8c97a4bf301..0000000000000 --- a/suites/upgrade/dumpling-emperor-x/parallel/4-workload/test_rbd_api.yaml +++ /dev/null @@ -1,7 +0,0 @@ -workload2: - sequential: - - workunit: - branch: dumpling - clients: - client.0: - - rbd/test_librbd.sh diff --git a/suites/upgrade/dumpling-emperor-x/parallel/4-workload/test_rbd_python.yaml b/suites/upgrade/dumpling-emperor-x/parallel/4-workload/test_rbd_python.yaml deleted file mode 100644 index 1edb13cf907b7..0000000000000 --- a/suites/upgrade/dumpling-emperor-x/parallel/4-workload/test_rbd_python.yaml +++ /dev/null @@ -1,7 +0,0 @@ -workload2: - sequential: - - workunit: - branch: dumpling - clients: - client.0: - - rbd/test_librbd_python.sh diff --git a/suites/upgrade/dumpling-emperor-x/parallel/5-upgrade-sequence/upgrade-all.yaml b/suites/upgrade/dumpling-emperor-x/parallel/5-upgrade-sequence/upgrade-all.yaml deleted file mode 100644 index f5d10cdfcaba8..0000000000000 --- a/suites/upgrade/dumpling-emperor-x/parallel/5-upgrade-sequence/upgrade-all.yaml +++ /dev/null @@ -1,6 +0,0 @@ -upgrade-sequence: - sequential: - - install.upgrade: - mon.a: - mon.b: - - ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3] diff --git a/suites/upgrade/dumpling-emperor-x/parallel/5-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/dumpling-emperor-x/parallel/5-upgrade-sequence/upgrade-mon-osd-mds.yaml deleted file mode 100644 index fcb61b1cef2c1..0000000000000 --- a/suites/upgrade/dumpling-emperor-x/parallel/5-upgrade-sequence/upgrade-mon-osd-mds.yaml +++ /dev/null @@ -1,33 +0,0 @@ -upgrade-sequence: - sequential: - - install.upgrade: - mon.a: - mon.b: - - 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] - - sleep: - duration: 60 - - ceph.restart: [mds.a] diff --git a/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/+ b/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/+ deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/ec-rados-plugin=jerasure-k=2-m=1.yaml b/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/ec-rados-plugin=jerasure-k=2-m=1.yaml deleted file mode 120000 index 4baff9bdd2f25..0000000000000 --- a/suites/upgrade/dumpling-emperor-x/parallel/6-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/dumpling-emperor-x/parallel/6-final-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml b/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml deleted file mode 120000 index 4b9d9a44a245d..0000000000000 --- a/suites/upgrade/dumpling-emperor-x/parallel/6-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/dumpling-emperor-x/parallel/6-final-workload/rados-snaps-few-objects.yaml b/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/rados-snaps-few-objects.yaml deleted file mode 100644 index bf85020d8d937..0000000000000 --- a/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/rados-snaps-few-objects.yaml +++ /dev/null @@ -1,12 +0,0 @@ -tasks: -- rados: - clients: [client.1] - ops: 4000 - objects: 50 - op_weights: - read: 100 - write: 100 - delete: 50 - snap_create: 50 - snap_remove: 50 - rollback: 50 diff --git a/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/rados_loadgenmix.yaml b/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/rados_loadgenmix.yaml deleted file mode 100644 index 0bddda0ab841d..0000000000000 --- a/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/rados_loadgenmix.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: - - workunit: - branch: dumpling - clients: - client.1: - - rados/load-gen-mix.sh diff --git a/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/rados_mon_thrash.yaml b/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/rados_mon_thrash.yaml deleted file mode 100644 index 1a932e059f07b..0000000000000 --- a/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/rados_mon_thrash.yaml +++ /dev/null @@ -1,9 +0,0 @@ -tasks: -- mon_thrash: - revive_delay: 20 - thrash_delay: 1 -- workunit: - branch: dumpling - clients: - client.1: - - rados/test.sh diff --git a/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/rbd_cls.yaml b/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/rbd_cls.yaml deleted file mode 100644 index 9407ab48916b9..0000000000000 --- a/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/rbd_cls.yaml +++ /dev/null @@ -1,7 +0,0 @@ -tasks: -- workunit: - branch: dumpling - clients: - client.1: - - cls/test_cls_rbd.sh - diff --git a/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/rbd_import_export.yaml b/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/rbd_import_export.yaml deleted file mode 100644 index 185cd1ab32aae..0000000000000 --- a/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/rbd_import_export.yaml +++ /dev/null @@ -1,8 +0,0 @@ -tasks: -- workunit: - branch: dumpling - clients: - client.1: - - rbd/import_export.sh - env: - RBD_CREATE_ARGS: --new-format diff --git a/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/rgw_s3tests.yaml b/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/rgw_s3tests.yaml deleted file mode 100644 index 22c3a3f821a3c..0000000000000 --- a/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/rgw_s3tests.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tasks: -- rgw: [client.1] -- s3tests: - client.1: - rgw_server: client.1 diff --git a/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/rgw_swift.yaml b/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/rgw_swift.yaml deleted file mode 100644 index 0ab9febd2fc00..0000000000000 --- a/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/rgw_swift.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -# Uncomment the next line if you have not already included rgw_s3tests.yaml in your test. -# - rgw: [client.1] -- swift: - client.1: - rgw_server: client.1 diff --git a/suites/upgrade/dumpling-emperor-x/parallel/distros b/suites/upgrade/dumpling-emperor-x/parallel/distros deleted file mode 120000 index 79010c36a5998..0000000000000 --- a/suites/upgrade/dumpling-emperor-x/parallel/distros +++ /dev/null @@ -1 +0,0 @@ -../../../../distros/supported \ No newline at end of file diff --git a/suites/upgrade/dumpling-firefly-x/parallel/% b/suites/upgrade/dumpling-firefly-x/parallel/% deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/suites/upgrade/dumpling-firefly-x/parallel/0-cluster/start.yaml b/suites/upgrade/dumpling-firefly-x/parallel/0-cluster/start.yaml deleted file mode 100644 index 460b39f804af3..0000000000000 --- a/suites/upgrade/dumpling-firefly-x/parallel/0-cluster/start.yaml +++ /dev/null @@ -1,20 +0,0 @@ -overrides: - ceph: - conf: - mon: - mon warn on legacy crush tunables: false - 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/dumpling-firefly-x/parallel/1-dumpling-install/dumpling.yaml b/suites/upgrade/dumpling-firefly-x/parallel/1-dumpling-install/dumpling.yaml deleted file mode 100644 index 60b2f13c985d1..0000000000000 --- a/suites/upgrade/dumpling-firefly-x/parallel/1-dumpling-install/dumpling.yaml +++ /dev/null @@ -1,14 +0,0 @@ -tasks: -- install: - branch: dumpling -- print: "**** done dumpling install" -- ceph: - fs: xfs -- parallel: - - workload - - upgrade-sequence -- print: "**** done parallel" -- install.upgrade: - client.0: - branch: firefly -- print: "*** client.0 upgraded to firefly" diff --git a/suites/upgrade/dumpling-firefly-x/parallel/2-workload/+ b/suites/upgrade/dumpling-firefly-x/parallel/2-workload/+ deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/suites/upgrade/dumpling-firefly-x/parallel/2-workload/rados_api.yaml b/suites/upgrade/dumpling-firefly-x/parallel/2-workload/rados_api.yaml deleted file mode 100644 index 3c7c90ef81f77..0000000000000 --- a/suites/upgrade/dumpling-firefly-x/parallel/2-workload/rados_api.yaml +++ /dev/null @@ -1,10 +0,0 @@ -workload: - sequential: - - workunit: - branch: dumpling - clients: - client.0: - # make sure to run test-upgrade-firefly.sh when running the cluster is mixed mode between firefly and dumpling - - rados/test-upgrade-firefly.sh - - cls - - print: "**** done rados/test.sh & cls" diff --git a/suites/upgrade/dumpling-firefly-x/parallel/2-workload/rados_loadgenbig.yaml b/suites/upgrade/dumpling-firefly-x/parallel/2-workload/rados_loadgenbig.yaml deleted file mode 100644 index 3bcf62b0cb7fd..0000000000000 --- a/suites/upgrade/dumpling-firefly-x/parallel/2-workload/rados_loadgenbig.yaml +++ /dev/null @@ -1,8 +0,0 @@ -workload: - sequential: - - workunit: - branch: dumpling - clients: - client.0: - - rados/load-gen-big.sh - - print: "**** done rados/load-gen-big.sh" diff --git a/suites/upgrade/dumpling-firefly-x/parallel/2-workload/test_rbd_api.yaml b/suites/upgrade/dumpling-firefly-x/parallel/2-workload/test_rbd_api.yaml deleted file mode 100644 index d5b07c15de8bd..0000000000000 --- a/suites/upgrade/dumpling-firefly-x/parallel/2-workload/test_rbd_api.yaml +++ /dev/null @@ -1,8 +0,0 @@ -workload: - sequential: - - workunit: - branch: dumpling - clients: - client.0: - - rbd/test_librbd.sh - - print: "**** done rbd/test_librbd.sh" diff --git a/suites/upgrade/dumpling-firefly-x/parallel/2-workload/test_rbd_python.yaml b/suites/upgrade/dumpling-firefly-x/parallel/2-workload/test_rbd_python.yaml deleted file mode 100644 index 4063ad7f915f9..0000000000000 --- a/suites/upgrade/dumpling-firefly-x/parallel/2-workload/test_rbd_python.yaml +++ /dev/null @@ -1,8 +0,0 @@ -workload: - sequential: - - workunit: - branch: dumpling - clients: - client.0: - - rbd/test_librbd_python.sh - - print: "**** done rbd/test_librbd_python.sh" diff --git a/suites/upgrade/dumpling-firefly-x/parallel/3-upgrade-sequence/upgrade-all.yaml b/suites/upgrade/dumpling-firefly-x/parallel/3-upgrade-sequence/upgrade-all.yaml deleted file mode 100644 index 7c057dbca995c..0000000000000 --- a/suites/upgrade/dumpling-firefly-x/parallel/3-upgrade-sequence/upgrade-all.yaml +++ /dev/null @@ -1,10 +0,0 @@ -upgrade-sequence: - sequential: - - install.upgrade: - mon.a: - branch: firefly - mon.b: - branch: firefly - - print: "**** done install.upgrade firefly for 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 the cluster" diff --git a/suites/upgrade/dumpling-firefly-x/parallel/4-firefly-upgrade/firefly.yaml b/suites/upgrade/dumpling-firefly-x/parallel/4-firefly-upgrade/firefly.yaml deleted file mode 100644 index bb530565107a4..0000000000000 --- a/suites/upgrade/dumpling-firefly-x/parallel/4-firefly-upgrade/firefly.yaml +++ /dev/null @@ -1,8 +0,0 @@ -tasks: - - parallel: - - workload2 - - upgrade-sequence2 - - print: "**** done parallel" - - install.upgrade: - client.0: - - print: "**** done install.upgrade client.0 to the version from teuthology-suite arg" diff --git a/suites/upgrade/dumpling-firefly-x/parallel/5-workload/+ b/suites/upgrade/dumpling-firefly-x/parallel/5-workload/+ deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/suites/upgrade/dumpling-firefly-x/parallel/5-workload/rados_api.yaml b/suites/upgrade/dumpling-firefly-x/parallel/5-workload/rados_api.yaml deleted file mode 100644 index 47573726b0f84..0000000000000 --- a/suites/upgrade/dumpling-firefly-x/parallel/5-workload/rados_api.yaml +++ /dev/null @@ -1,9 +0,0 @@ -workload2: - sequential: - - workunit: - branch: firefly - clients: - client.0: - - rados/test.sh - - cls - - print: "**** done #rados/test.sh and cls 2" diff --git a/suites/upgrade/dumpling-firefly-x/parallel/5-workload/rados_loadgenbig.yaml b/suites/upgrade/dumpling-firefly-x/parallel/5-workload/rados_loadgenbig.yaml deleted file mode 100644 index 451130e2e3824..0000000000000 --- a/suites/upgrade/dumpling-firefly-x/parallel/5-workload/rados_loadgenbig.yaml +++ /dev/null @@ -1,8 +0,0 @@ -workload2: - sequential: - - workunit: - branch: firefly - clients: - client.0: - - rados/load-gen-big.sh - - print: "**** done rados/load-gen-big.sh 2" diff --git a/suites/upgrade/dumpling-firefly-x/parallel/5-workload/test_rbd_api.yaml b/suites/upgrade/dumpling-firefly-x/parallel/5-workload/test_rbd_api.yaml deleted file mode 100644 index 1cf824d99bf30..0000000000000 --- a/suites/upgrade/dumpling-firefly-x/parallel/5-workload/test_rbd_api.yaml +++ /dev/null @@ -1,8 +0,0 @@ -workload2: - sequential: - - workunit: - branch: firefly - clients: - client.0: - - rbd/test_librbd.sh - - print: "**** done rbd/test_librbd.sh 2" diff --git a/suites/upgrade/dumpling-firefly-x/parallel/5-workload/test_rbd_python.yaml b/suites/upgrade/dumpling-firefly-x/parallel/5-workload/test_rbd_python.yaml deleted file mode 100644 index 9409329b0a4fc..0000000000000 --- a/suites/upgrade/dumpling-firefly-x/parallel/5-workload/test_rbd_python.yaml +++ /dev/null @@ -1,8 +0,0 @@ -workload2: - sequential: - - workunit: - branch: firefly - clients: - client.0: - - rbd/test_librbd_python.sh - - print: "**** done rbd/test_librbd_python.sh 2" diff --git a/suites/upgrade/dumpling-firefly-x/parallel/6-upgrade-sequence/upgrade-by-daemon.yaml b/suites/upgrade/dumpling-firefly-x/parallel/6-upgrade-sequence/upgrade-by-daemon.yaml deleted file mode 100644 index 9e47aa8f681ab..0000000000000 --- a/suites/upgrade/dumpling-firefly-x/parallel/6-upgrade-sequence/upgrade-by-daemon.yaml +++ /dev/null @@ -1,39 +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 firefly - - 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 -### removed to fix #9642 -# - install.upgrade: -# client.0: -# - print: "*** client.0 upgraded" diff --git a/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/+ b/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/+ deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/ec-rados-plugin=jerasure-k=2-m=1.yaml b/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/ec-rados-plugin=jerasure-k=2-m=1.yaml deleted file mode 120000 index 4baff9bdd2f25..0000000000000 --- a/suites/upgrade/dumpling-firefly-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/dumpling-firefly-x/parallel/7-final-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml b/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml deleted file mode 120000 index 4b9d9a44a245d..0000000000000 --- a/suites/upgrade/dumpling-firefly-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/dumpling-firefly-x/parallel/7-final-workload/rados-snaps-few-objects.yaml b/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/rados-snaps-few-objects.yaml deleted file mode 100644 index bf85020d8d937..0000000000000 --- a/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/rados-snaps-few-objects.yaml +++ /dev/null @@ -1,12 +0,0 @@ -tasks: -- rados: - clients: [client.1] - ops: 4000 - objects: 50 - op_weights: - read: 100 - write: 100 - delete: 50 - snap_create: 50 - snap_remove: 50 - rollback: 50 diff --git a/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/rados_loadgenmix.yaml b/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/rados_loadgenmix.yaml deleted file mode 100644 index 879b7b6d1898d..0000000000000 --- a/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/rados_loadgenmix.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tasks: - - workunit: - clients: - client.1: - - rados/load-gen-mix.sh diff --git a/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/rados_mon_thrash.yaml b/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/rados_mon_thrash.yaml deleted file mode 100644 index 5c4c6297cfe35..0000000000000 --- a/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/rados_mon_thrash.yaml +++ /dev/null @@ -1,10 +0,0 @@ -tasks: - - sequential: - - mon_thrash: - revive_delay: 20 - thrash_delay: 1 - - workunit: - clients: - client.1: - - rados/test.sh - - print: "**** done rados/test.sh - 6-final-workload" diff --git a/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/rbd_cls.yaml b/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/rbd_cls.yaml deleted file mode 100644 index 908b79e869ac0..0000000000000 --- a/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/rbd_cls.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- workunit: - clients: - client.1: - - cls/test_cls_rbd.sh - diff --git a/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/rbd_import_export.yaml b/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/rbd_import_export.yaml deleted file mode 100644 index a7ce2141ee59b..0000000000000 --- a/suites/upgrade/dumpling-firefly-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/dumpling-firefly-x/parallel/7-final-workload/rgw_s3tests.yaml b/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/rgw_s3tests.yaml deleted file mode 100644 index 22c3a3f821a3c..0000000000000 --- a/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/rgw_s3tests.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tasks: -- rgw: [client.1] -- s3tests: - client.1: - rgw_server: client.1 diff --git a/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/rgw_swift.yaml b/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/rgw_swift.yaml deleted file mode 100644 index 0ab9febd2fc00..0000000000000 --- a/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/rgw_swift.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -# Uncomment the next line if you have not already included rgw_s3tests.yaml in your test. -# - rgw: [client.1] -- swift: - client.1: - rgw_server: client.1 diff --git a/suites/upgrade/dumpling-firefly-x/parallel/README b/suites/upgrade/dumpling-firefly-x/parallel/README deleted file mode 100644 index 8eff0ed5c9400..0000000000000 --- a/suites/upgrade/dumpling-firefly-x/parallel/README +++ /dev/null @@ -1,72 +0,0 @@ -Purpose -======= - -This suite tests upgrades of a ceph cluster from dumpling (current -branch) to firefly (current branch), and then to a later specified -version (version x, e.g. for example ‘next’ or ‘master’). It runs the -last upgrade (steps in 3-firefly-upgrade) in parallel with firefly -client tests. - - -Structure -========= - -Generally the flow is: -- install dumpling -- test it -- upgrade cluster and clients to firefly -- test firefly while upgrading cluster to version x -- upgrade clients -- test with version x clients - -0-cluster ---------- - -Defines the cluster layout - two nodes run ceph daemons, and a third -acts as a client. (This is under 'roles:' section in the final yaml) - -1-dumpling-install ------------------- - -Installs dumpling and runs correctness tests from the 'workload' section - -2-workload ----------- - -Defines the 'workload' section - correctness tests to run on dumpling -“+” is used to construct a single yaml load from all tests in this directory - -3-firefly-upgrade ------------------ - -First upgrades everything to firefly. Then upgrades the cluster to -version x while running correctness tests (from the 'workload2' -section) on firefly clients in parallel. This upgrade is done by the -'upgrade-sequence' section, defined later. Once the cluster is -upgraded and these tests complete, upgrades the clients to version x -as well. - -Clients are upgraded last to avoid running newer tests that don't work -against firefly, and to verify that firefly clients can continue -working with a newer cluster. - -4-workload ----------- - -Defines the 'workload2' section - correctness tests to run during the -upgrade from firefly to version x. -“+” is used to construct a single yaml load from all tests in this directory - -5-upgrade-sequence ------------------- - -Defines the 'upgrade-sequence' section - the order in which the -upgrade from firefly to version x is done. Note that leaving the -version unspecified here is what makes it upgrade to version x, -which is set as an override when this suite is scheduled. - -6-final-workload ----------------- - -Runs some final correctness tests of version x clients. -“+” is used to construct a single yaml load from all tests in this directory diff --git a/suites/upgrade/dumpling-firefly-x/parallel/distros b/suites/upgrade/dumpling-firefly-x/parallel/distros deleted file mode 120000 index 79010c36a5998..0000000000000 --- a/suites/upgrade/dumpling-firefly-x/parallel/distros +++ /dev/null @@ -1 +0,0 @@ -../../../../distros/supported \ No newline at end of file diff --git a/suites/upgrade/dumpling-firefly-x/stress-split/% b/suites/upgrade/dumpling-firefly-x/stress-split/% deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/suites/upgrade/dumpling-firefly-x/stress-split/00-cluster/start.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/00-cluster/start.yaml deleted file mode 100644 index 129635fa52a96..0000000000000 --- a/suites/upgrade/dumpling-firefly-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/dumpling-firefly-x/stress-split/01-dumpling-install/dumpling.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/01-dumpling-install/dumpling.yaml deleted file mode 100644 index c98631e2bbdd2..0000000000000 --- a/suites/upgrade/dumpling-firefly-x/stress-split/01-dumpling-install/dumpling.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tasks: -- install: - branch: dumpling -- ceph: - fs: xfs diff --git a/suites/upgrade/dumpling-firefly-x/stress-split/02-partial-upgrade-firefly/firsthalf.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/02-partial-upgrade-firefly/firsthalf.yaml deleted file mode 100644 index 1098b089d88be..0000000000000 --- a/suites/upgrade/dumpling-firefly-x/stress-split/02-partial-upgrade-firefly/firsthalf.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- install.upgrade: - osd.0: - branch: firefly -- ceph.restart: - daemons: [osd.0, osd.1, osd.2] diff --git a/suites/upgrade/dumpling-firefly-x/stress-split/03-workload/rbd.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/03-workload/rbd.yaml deleted file mode 100644 index 9ccd57c4a82a7..0000000000000 --- a/suites/upgrade/dumpling-firefly-x/stress-split/03-workload/rbd.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tasks: -- workunit: - clients: - client.0: - - cls/test_cls_rbd.sh diff --git a/suites/upgrade/dumpling-firefly-x/stress-split/04-mona-upgrade-firefly/mona.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/04-mona-upgrade-firefly/mona.yaml deleted file mode 100644 index b6ffb3323d11e..0000000000000 --- a/suites/upgrade/dumpling-firefly-x/stress-split/04-mona-upgrade-firefly/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/dumpling-firefly-x/stress-split/05-workload/+ b/suites/upgrade/dumpling-firefly-x/stress-split/05-workload/+ deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/suites/upgrade/dumpling-firefly-x/stress-split/05-workload/rbd-cls.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/05-workload/rbd-cls.yaml deleted file mode 100644 index 9ccd57c4a82a7..0000000000000 --- a/suites/upgrade/dumpling-firefly-x/stress-split/05-workload/rbd-cls.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tasks: -- workunit: - clients: - client.0: - - cls/test_cls_rbd.sh diff --git a/suites/upgrade/dumpling-firefly-x/stress-split/05-workload/readwrite.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/05-workload/readwrite.yaml deleted file mode 100644 index c53e52b0872b6..0000000000000 --- a/suites/upgrade/dumpling-firefly-x/stress-split/05-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/dumpling-firefly-x/stress-split/06-monb-upgrade-firefly/monb.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/06-monb-upgrade-firefly/monb.yaml deleted file mode 100644 index 513890c41c015..0000000000000 --- a/suites/upgrade/dumpling-firefly-x/stress-split/06-monb-upgrade-firefly/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/dumpling-firefly-x/stress-split/07-workload/+ b/suites/upgrade/dumpling-firefly-x/stress-split/07-workload/+ deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/suites/upgrade/dumpling-firefly-x/stress-split/07-workload/radosbench.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/07-workload/radosbench.yaml deleted file mode 100644 index 3940870fce0f9..0000000000000 --- a/suites/upgrade/dumpling-firefly-x/stress-split/07-workload/radosbench.yaml +++ /dev/null @@ -1,4 +0,0 @@ -tasks: -- radosbench: - clients: [client.0] - time: 1800 diff --git a/suites/upgrade/dumpling-firefly-x/stress-split/07-workload/rbd_api.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/07-workload/rbd_api.yaml deleted file mode 100644 index 1ecaee4bf78fa..0000000000000 --- a/suites/upgrade/dumpling-firefly-x/stress-split/07-workload/rbd_api.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tasks: -- workunit: - clients: - client.0: - - rbd/test_librbd.sh diff --git a/suites/upgrade/dumpling-firefly-x/stress-split/08-monc-upgrade-firefly/monc.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/08-monc-upgrade-firefly/monc.yaml deleted file mode 100644 index e9273236ba331..0000000000000 --- a/suites/upgrade/dumpling-firefly-x/stress-split/08-monc-upgrade-firefly/monc.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- 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/dumpling-firefly-x/stress-split/09-workload/rbd-python.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/09-workload/rbd-python.yaml deleted file mode 100644 index 8273c40457a4b..0000000000000 --- a/suites/upgrade/dumpling-firefly-x/stress-split/09-workload/rbd-python.yaml +++ /dev/null @@ -1,7 +0,0 @@ -tasks: -- workunit: - #fixes #10577 - branch: dumpling - clients: - client.0: - - rbd/test_librbd_python.sh diff --git a/suites/upgrade/dumpling-firefly-x/stress-split/10-osds-upgrade-firefly/secondhalf.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/10-osds-upgrade-firefly/secondhalf.yaml deleted file mode 100644 index 917894b2fe4b0..0000000000000 --- a/suites/upgrade/dumpling-firefly-x/stress-split/10-osds-upgrade-firefly/secondhalf.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- install.upgrade: - osd.3: - branch: firefly -- ceph.restart: - daemons: [osd.3, osd.4, osd.5] diff --git a/suites/upgrade/dumpling-firefly-x/stress-split/11-workload/snaps-few-objects.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/11-workload/snaps-few-objects.yaml deleted file mode 100644 index c54039766c0b7..0000000000000 --- a/suites/upgrade/dumpling-firefly-x/stress-split/11-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/dumpling-firefly-x/stress-split/12-partial-upgrade-x/first.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/12-partial-upgrade-x/first.yaml deleted file mode 100644 index 68c9d44b7c34b..0000000000000 --- a/suites/upgrade/dumpling-firefly-x/stress-split/12-partial-upgrade-x/first.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/dumpling-firefly-x/stress-split/13-workload/rados_loadgen_big.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/13-workload/rados_loadgen_big.yaml deleted file mode 100644 index b0030093e7219..0000000000000 --- a/suites/upgrade/dumpling-firefly-x/stress-split/13-workload/rados_loadgen_big.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tasks: -- workunit: - clients: - client.0: - - rados/load-gen-big.sh diff --git a/suites/upgrade/dumpling-firefly-x/stress-split/14-mona-upgrade-x/mona.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/14-mona-upgrade-x/mona.yaml deleted file mode 100644 index b6ffb3323d11e..0000000000000 --- a/suites/upgrade/dumpling-firefly-x/stress-split/14-mona-upgrade-x/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/dumpling-firefly-x/stress-split/15-workload/rbd-import-export.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/15-workload/rbd-import-export.yaml deleted file mode 100644 index 49070827be09b..0000000000000 --- a/suites/upgrade/dumpling-firefly-x/stress-split/15-workload/rbd-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/dumpling-firefly-x/stress-split/16-monb-upgrade-x/monb.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/16-monb-upgrade-x/monb.yaml deleted file mode 100644 index 513890c41c015..0000000000000 --- a/suites/upgrade/dumpling-firefly-x/stress-split/16-monb-upgrade-x/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/dumpling-firefly-x/stress-split/17-workload/readwrite.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/17-workload/readwrite.yaml deleted file mode 100644 index c53e52b0872b6..0000000000000 --- a/suites/upgrade/dumpling-firefly-x/stress-split/17-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/dumpling-firefly-x/stress-split/18-monc-upgrade-x/monc.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/18-monc-upgrade-x/monc.yaml deleted file mode 100644 index e9273236ba331..0000000000000 --- a/suites/upgrade/dumpling-firefly-x/stress-split/18-monc-upgrade-x/monc.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- 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/dumpling-firefly-x/stress-split/19-workload/radosbench.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/19-workload/radosbench.yaml deleted file mode 100644 index 3940870fce0f9..0000000000000 --- a/suites/upgrade/dumpling-firefly-x/stress-split/19-workload/radosbench.yaml +++ /dev/null @@ -1,4 +0,0 @@ -tasks: -- radosbench: - clients: [client.0] - time: 1800 diff --git a/suites/upgrade/dumpling-firefly-x/stress-split/20-osds-upgrade-x/osds_secondhalf.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/20-osds-upgrade-x/osds_secondhalf.yaml deleted file mode 100644 index 88d4bb5ec983b..0000000000000 --- a/suites/upgrade/dumpling-firefly-x/stress-split/20-osds-upgrade-x/osds_secondhalf.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tasks: -- install.upgrade: - osd.3: -- ceph.restart: - daemons: [osd.3, osd.4, osd.5] diff --git a/suites/upgrade/dumpling-firefly-x/stress-split/21-final-workload/+ b/suites/upgrade/dumpling-firefly-x/stress-split/21-final-workload/+ deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/suites/upgrade/dumpling-firefly-x/stress-split/21-final-workload/rados_stress_watch.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/21-final-workload/rados_stress_watch.yaml deleted file mode 100644 index 0e1ba010c5b4e..0000000000000 --- a/suites/upgrade/dumpling-firefly-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/dumpling-firefly-x/stress-split/21-final-workload/rbd_cls_tests.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/21-final-workload/rbd_cls_tests.yaml deleted file mode 100644 index 9ccd57c4a82a7..0000000000000 --- a/suites/upgrade/dumpling-firefly-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/dumpling-firefly-x/stress-split/21-final-workload/rgw-swift.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/21-final-workload/rgw-swift.yaml deleted file mode 100644 index 0d79fb621ea9a..0000000000000 --- a/suites/upgrade/dumpling-firefly-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/dumpling-firefly-x/stress-split/distros b/suites/upgrade/dumpling-firefly-x/stress-split/distros deleted file mode 120000 index 79010c36a5998..0000000000000 --- a/suites/upgrade/dumpling-firefly-x/stress-split/distros +++ /dev/null @@ -1 +0,0 @@ -../../../../distros/supported \ No newline at end of file diff --git a/suites/upgrade/dumpling-giant-x/parallel/6-final-workload/ec-rados-plugin=jerasure-k=2-m=1.yaml b/suites/upgrade/dumpling-giant-x/parallel/6-final-workload/ec-rados-plugin=jerasure-k=2-m=1.yaml deleted file mode 120000 index 4baff9bdd2f25..0000000000000 --- a/suites/upgrade/dumpling-giant-x/parallel/6-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/dumpling-x/parallel/% b/suites/upgrade/dumpling-x/parallel/% deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/suites/upgrade/dumpling-x/parallel/0-cluster/start.yaml b/suites/upgrade/dumpling-x/parallel/0-cluster/start.yaml deleted file mode 100644 index c39d9dfeca9fc..0000000000000 --- a/suites/upgrade/dumpling-x/parallel/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.0 - - client.1 -overrides: - ceph: - conf: - mon: - mon warn on legacy crush tunables: false - log-whitelist: - - scrub mismatch - - ScrubResult - - failed to encode map diff --git a/suites/upgrade/dumpling-x/parallel/1-dumpling-install/dumpling.yaml b/suites/upgrade/dumpling-x/parallel/1-dumpling-install/dumpling.yaml deleted file mode 100644 index adbdedee51846..0000000000000 --- a/suites/upgrade/dumpling-x/parallel/1-dumpling-install/dumpling.yaml +++ /dev/null @@ -1,11 +0,0 @@ -tasks: -- install: - branch: dumpling -- print: "**** done install" -- ceph: - fs: xfs -- print: "**** done ceph" -- parallel: - - workload - - upgrade-sequence -- print: "**** done parallel" diff --git a/suites/upgrade/dumpling-x/parallel/2-workload/rados_api.yaml b/suites/upgrade/dumpling-x/parallel/2-workload/rados_api.yaml deleted file mode 100644 index cd820a8a71135..0000000000000 --- a/suites/upgrade/dumpling-x/parallel/2-workload/rados_api.yaml +++ /dev/null @@ -1,9 +0,0 @@ -workload: - sequential: - - workunit: - branch: dumpling - clients: - client.0: - - rados/test-upgrade-firefly.sh - - cls - diff --git a/suites/upgrade/dumpling-x/parallel/2-workload/rados_loadgenbig.yaml b/suites/upgrade/dumpling-x/parallel/2-workload/rados_loadgenbig.yaml deleted file mode 100644 index cc1ef874cb0b3..0000000000000 --- a/suites/upgrade/dumpling-x/parallel/2-workload/rados_loadgenbig.yaml +++ /dev/null @@ -1,7 +0,0 @@ -workload: - sequential: - - workunit: - branch: dumpling - clients: - client.0: - - rados/load-gen-big.sh diff --git a/suites/upgrade/dumpling-x/parallel/2-workload/test_rbd_api.yaml b/suites/upgrade/dumpling-x/parallel/2-workload/test_rbd_api.yaml deleted file mode 100644 index 36ffa27ec3fcb..0000000000000 --- a/suites/upgrade/dumpling-x/parallel/2-workload/test_rbd_api.yaml +++ /dev/null @@ -1,7 +0,0 @@ -workload: - sequential: - - workunit: - branch: dumpling - clients: - client.0: - - rbd/test_librbd.sh diff --git a/suites/upgrade/dumpling-x/parallel/2-workload/test_rbd_python.yaml b/suites/upgrade/dumpling-x/parallel/2-workload/test_rbd_python.yaml deleted file mode 100644 index e704a9794b9ee..0000000000000 --- a/suites/upgrade/dumpling-x/parallel/2-workload/test_rbd_python.yaml +++ /dev/null @@ -1,7 +0,0 @@ -workload: - sequential: - - workunit: - branch: dumpling - clients: - client.0: - - rbd/test_librbd_python.sh diff --git a/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-all.yaml b/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-all.yaml deleted file mode 100644 index f5d10cdfcaba8..0000000000000 --- a/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-all.yaml +++ /dev/null @@ -1,6 +0,0 @@ -upgrade-sequence: - sequential: - - install.upgrade: - mon.a: - mon.b: - - ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3] diff --git a/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml deleted file mode 100644 index fcb61b1cef2c1..0000000000000 --- a/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml +++ /dev/null @@ -1,33 +0,0 @@ -upgrade-sequence: - sequential: - - install.upgrade: - mon.a: - mon.b: - - 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] - - sleep: - duration: 60 - - ceph.restart: [mds.a] diff --git a/suites/upgrade/dumpling-x/parallel/4-final-upgrade/client.yaml b/suites/upgrade/dumpling-x/parallel/4-final-upgrade/client.yaml deleted file mode 100644 index cf35d41e6c536..0000000000000 --- a/suites/upgrade/dumpling-x/parallel/4-final-upgrade/client.yaml +++ /dev/null @@ -1,4 +0,0 @@ -tasks: - - install.upgrade: - client.0: - - print: "**** done install.upgrade" diff --git a/suites/upgrade/dumpling-x/parallel/5-final-workload/ec-rados-plugin=jerasure-k=2-m=1.yaml b/suites/upgrade/dumpling-x/parallel/5-final-workload/ec-rados-plugin=jerasure-k=2-m=1.yaml deleted file mode 120000 index 4baff9bdd2f25..0000000000000 --- a/suites/upgrade/dumpling-x/parallel/5-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/dumpling-x/parallel/5-final-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml b/suites/upgrade/dumpling-x/parallel/5-final-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml deleted file mode 120000 index 4b9d9a44a245d..0000000000000 --- a/suites/upgrade/dumpling-x/parallel/5-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/dumpling-x/parallel/5-final-workload/rados-snaps-few-objects.yaml b/suites/upgrade/dumpling-x/parallel/5-final-workload/rados-snaps-few-objects.yaml deleted file mode 100644 index 40f66da37f256..0000000000000 --- a/suites/upgrade/dumpling-x/parallel/5-final-workload/rados-snaps-few-objects.yaml +++ /dev/null @@ -1,12 +0,0 @@ -tasks: - - rados: - clients: [client.1] - ops: 4000 - objects: 50 - op_weights: - read: 100 - write: 100 - delete: 50 - snap_create: 50 - snap_remove: 50 - rollback: 50 diff --git a/suites/upgrade/dumpling-x/parallel/5-final-workload/rados_loadgenmix.yaml b/suites/upgrade/dumpling-x/parallel/5-final-workload/rados_loadgenmix.yaml deleted file mode 100644 index faa96ed24d52e..0000000000000 --- a/suites/upgrade/dumpling-x/parallel/5-final-workload/rados_loadgenmix.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tasks: - - workunit: - clients: - client.1: - - rados/load-gen-mix.sh diff --git a/suites/upgrade/dumpling-x/parallel/5-final-workload/rados_mon_thrash.yaml b/suites/upgrade/dumpling-x/parallel/5-final-workload/rados_mon_thrash.yaml deleted file mode 100644 index 88019bef17ad8..0000000000000 --- a/suites/upgrade/dumpling-x/parallel/5-final-workload/rados_mon_thrash.yaml +++ /dev/null @@ -1,8 +0,0 @@ -tasks: - - mon_thrash: - revive_delay: 20 - thrash_delay: 1 - - workunit: - clients: - client.1: - - rados/test.sh diff --git a/suites/upgrade/dumpling-x/parallel/5-final-workload/rbd_cls.yaml b/suites/upgrade/dumpling-x/parallel/5-final-workload/rbd_cls.yaml deleted file mode 100644 index 4ef47768237e9..0000000000000 --- a/suites/upgrade/dumpling-x/parallel/5-final-workload/rbd_cls.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: - - workunit: - clients: - client.1: - - cls/test_cls_rbd.sh - diff --git a/suites/upgrade/dumpling-x/parallel/5-final-workload/rbd_import_export.yaml b/suites/upgrade/dumpling-x/parallel/5-final-workload/rbd_import_export.yaml deleted file mode 100644 index 6c40377324d4d..0000000000000 --- a/suites/upgrade/dumpling-x/parallel/5-final-workload/rbd_import_export.yaml +++ /dev/null @@ -1,7 +0,0 @@ -tasks: - - workunit: - clients: - client.1: - - rbd/import_export.sh - env: - RBD_CREATE_ARGS: --new-format diff --git a/suites/upgrade/dumpling-x/parallel/5-final-workload/rgw_s3tests.yaml b/suites/upgrade/dumpling-x/parallel/5-final-workload/rgw_s3tests.yaml deleted file mode 100644 index 53ceb786ba0ef..0000000000000 --- a/suites/upgrade/dumpling-x/parallel/5-final-workload/rgw_s3tests.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: - - rgw: [client.1] - - s3tests: - client.1: - rgw_server: client.1 - branch: dumpling diff --git a/suites/upgrade/dumpling-x/parallel/5-final-workload/rgw_swift.yaml b/suites/upgrade/dumpling-x/parallel/5-final-workload/rgw_swift.yaml deleted file mode 100644 index 445224cef2dc9..0000000000000 --- a/suites/upgrade/dumpling-x/parallel/5-final-workload/rgw_swift.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tasks: - - rgw: [client.1] - - swift: - client.1: - rgw_server: client.1 diff --git a/suites/upgrade/dumpling-x/parallel/distros b/suites/upgrade/dumpling-x/parallel/distros deleted file mode 120000 index 79010c36a5998..0000000000000 --- a/suites/upgrade/dumpling-x/parallel/distros +++ /dev/null @@ -1 +0,0 @@ -../../../../distros/supported \ No newline at end of file diff --git a/suites/upgrade/dumpling-x/stress-split/% b/suites/upgrade/dumpling-x/stress-split/% deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/suites/upgrade/dumpling-x/stress-split/0-cluster/start.yaml b/suites/upgrade/dumpling-x/stress-split/0-cluster/start.yaml deleted file mode 100644 index a1b6b303f3302..0000000000000 --- a/suites/upgrade/dumpling-x/stress-split/0-cluster/start.yaml +++ /dev/null @@ -1,19 +0,0 @@ -overrides: - ceph: - conf: - mon: - mon warn on legacy crush tunables: false - log-whitelist: - - failed to encode map -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/dumpling-x/stress-split/1-dumpling-install/dumpling.yaml b/suites/upgrade/dumpling-x/stress-split/1-dumpling-install/dumpling.yaml deleted file mode 100644 index c98631e2bbdd2..0000000000000 --- a/suites/upgrade/dumpling-x/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/dumpling-x/stress-split/2-partial-upgrade/firsthalf.yaml b/suites/upgrade/dumpling-x/stress-split/2-partial-upgrade/firsthalf.yaml deleted file mode 100644 index 312df6e21c696..0000000000000 --- a/suites/upgrade/dumpling-x/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/dumpling-x/stress-split/3-thrash/default.yaml b/suites/upgrade/dumpling-x/stress-split/3-thrash/default.yaml deleted file mode 100644 index a85510eb6fa3a..0000000000000 --- a/suites/upgrade/dumpling-x/stress-split/3-thrash/default.yaml +++ /dev/null @@ -1,12 +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 - thrash_primary_affinity: false diff --git a/suites/upgrade/dumpling-x/stress-split/4-mon/mona.yaml b/suites/upgrade/dumpling-x/stress-split/4-mon/mona.yaml deleted file mode 100644 index b6ffb3323d11e..0000000000000 --- a/suites/upgrade/dumpling-x/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/dumpling-x/stress-split/5-workload/rados_api_tests.yaml b/suites/upgrade/dumpling-x/stress-split/5-workload/rados_api_tests.yaml deleted file mode 100644 index 7b2c72cbb2e88..0000000000000 --- a/suites/upgrade/dumpling-x/stress-split/5-workload/rados_api_tests.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- workunit: - branch: dumpling - clients: - client.0: - - rados/test-upgrade-firefly.sh diff --git a/suites/upgrade/dumpling-x/stress-split/5-workload/rbd-cls.yaml b/suites/upgrade/dumpling-x/stress-split/5-workload/rbd-cls.yaml deleted file mode 100644 index db3dff7fc5c06..0000000000000 --- a/suites/upgrade/dumpling-x/stress-split/5-workload/rbd-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/dumpling-x/stress-split/5-workload/rbd-import-export.yaml b/suites/upgrade/dumpling-x/stress-split/5-workload/rbd-import-export.yaml deleted file mode 100644 index a5a964ce13bf9..0000000000000 --- a/suites/upgrade/dumpling-x/stress-split/5-workload/rbd-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/dumpling-x/stress-split/5-workload/readwrite.yaml b/suites/upgrade/dumpling-x/stress-split/5-workload/readwrite.yaml deleted file mode 100644 index c53e52b0872b6..0000000000000 --- a/suites/upgrade/dumpling-x/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/dumpling-x/stress-split/5-workload/snaps-few-objects.yaml b/suites/upgrade/dumpling-x/stress-split/5-workload/snaps-few-objects.yaml deleted file mode 100644 index c54039766c0b7..0000000000000 --- a/suites/upgrade/dumpling-x/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/dumpling-x/stress-split/6-next-mon/monb.yaml b/suites/upgrade/dumpling-x/stress-split/6-next-mon/monb.yaml deleted file mode 100644 index 513890c41c015..0000000000000 --- a/suites/upgrade/dumpling-x/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/dumpling-x/stress-split/7-workload/rados_api_tests.yaml b/suites/upgrade/dumpling-x/stress-split/7-workload/rados_api_tests.yaml deleted file mode 100644 index 7b2c72cbb2e88..0000000000000 --- a/suites/upgrade/dumpling-x/stress-split/7-workload/rados_api_tests.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- workunit: - branch: dumpling - clients: - client.0: - - rados/test-upgrade-firefly.sh diff --git a/suites/upgrade/dumpling-x/stress-split/7-workload/radosbench.yaml b/suites/upgrade/dumpling-x/stress-split/7-workload/radosbench.yaml deleted file mode 100644 index 3940870fce0f9..0000000000000 --- a/suites/upgrade/dumpling-x/stress-split/7-workload/radosbench.yaml +++ /dev/null @@ -1,4 +0,0 @@ -tasks: -- radosbench: - clients: [client.0] - time: 1800 diff --git a/suites/upgrade/dumpling-x/stress-split/7-workload/rbd_api.yaml b/suites/upgrade/dumpling-x/stress-split/7-workload/rbd_api.yaml deleted file mode 100644 index bbcde3e15591f..0000000000000 --- a/suites/upgrade/dumpling-x/stress-split/7-workload/rbd_api.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- workunit: - branch: dumpling - clients: - client.0: - - rbd/test_librbd.sh diff --git a/suites/upgrade/dumpling-x/stress-split/8-next-mon/monc.yaml b/suites/upgrade/dumpling-x/stress-split/8-next-mon/monc.yaml deleted file mode 100644 index 73f22bd5f7cfc..0000000000000 --- a/suites/upgrade/dumpling-x/stress-split/8-next-mon/monc.yaml +++ /dev/null @@ -1,8 +0,0 @@ -tasks: -- install.upgrade: - mon.c: -- 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/dumpling-x/stress-split/9-workload/+ b/suites/upgrade/dumpling-x/stress-split/9-workload/+ deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/suites/upgrade/dumpling-x/stress-split/9-workload/rados_api_tests.yaml b/suites/upgrade/dumpling-x/stress-split/9-workload/rados_api_tests.yaml deleted file mode 100644 index 7b2c72cbb2e88..0000000000000 --- a/suites/upgrade/dumpling-x/stress-split/9-workload/rados_api_tests.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- workunit: - branch: dumpling - clients: - client.0: - - rados/test-upgrade-firefly.sh diff --git a/suites/upgrade/dumpling-x/stress-split/9-workload/rbd-python.yaml b/suites/upgrade/dumpling-x/stress-split/9-workload/rbd-python.yaml deleted file mode 100644 index 1c5e53906f899..0000000000000 --- a/suites/upgrade/dumpling-x/stress-split/9-workload/rbd-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/dumpling-x/stress-split/9-workload/rgw-s3tests.yaml b/suites/upgrade/dumpling-x/stress-split/9-workload/rgw-s3tests.yaml deleted file mode 100644 index e44546dbcaa64..0000000000000 --- a/suites/upgrade/dumpling-x/stress-split/9-workload/rgw-s3tests.yaml +++ /dev/null @@ -1,8 +0,0 @@ -tasks: -- rgw: - default_idle_timeout: 300 - client.0: -- swift: - client.0: - rgw_server: client.0 - diff --git a/suites/upgrade/dumpling-x/stress-split/9-workload/snaps-many-objects.yaml b/suites/upgrade/dumpling-x/stress-split/9-workload/snaps-many-objects.yaml deleted file mode 100644 index 9e311c946e1a4..0000000000000 --- a/suites/upgrade/dumpling-x/stress-split/9-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/dumpling-x/stress-split/distros b/suites/upgrade/dumpling-x/stress-split/distros deleted file mode 120000 index 79010c36a5998..0000000000000 --- a/suites/upgrade/dumpling-x/stress-split/distros +++ /dev/null @@ -1 +0,0 @@ -../../../../distros/supported \ No newline at end of file diff --git a/suites/upgrade/firefly-x/parallel-erasure-code/% b/suites/upgrade/firefly-x/parallel-erasure-code/% deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/suites/upgrade/firefly-x/parallel-erasure-code/0-cluster b/suites/upgrade/firefly-x/parallel-erasure-code/0-cluster deleted file mode 120000 index 877aba862bbdc..0000000000000 --- a/suites/upgrade/firefly-x/parallel-erasure-code/0-cluster +++ /dev/null @@ -1 +0,0 @@ -../parallel/0-cluster \ No newline at end of file diff --git a/suites/upgrade/firefly-x/parallel-erasure-code/1-firefly-install b/suites/upgrade/firefly-x/parallel-erasure-code/1-firefly-install deleted file mode 120000 index d569e006c7e7b..0000000000000 --- a/suites/upgrade/firefly-x/parallel-erasure-code/1-firefly-install +++ /dev/null @@ -1 +0,0 @@ -../parallel/1-firefly-install \ No newline at end of file diff --git a/suites/upgrade/firefly-x/parallel-erasure-code/3-upgrade-sequence b/suites/upgrade/firefly-x/parallel-erasure-code/3-upgrade-sequence deleted file mode 120000 index ab64a5fc02fb3..0000000000000 --- a/suites/upgrade/firefly-x/parallel-erasure-code/3-upgrade-sequence +++ /dev/null @@ -1 +0,0 @@ -../parallel/3-upgrade-sequence \ No newline at end of file diff --git a/suites/upgrade/firefly-x/parallel-erasure-code/4-final-workload b/suites/upgrade/firefly-x/parallel-erasure-code/4-final-workload deleted file mode 120000 index 4f8f10f5c6feb..0000000000000 --- a/suites/upgrade/firefly-x/parallel-erasure-code/4-final-workload +++ /dev/null @@ -1 +0,0 @@ -../parallel/4-final-workload \ No newline at end of file diff --git a/suites/upgrade/firefly-x/parallel-erasure-code/distros b/suites/upgrade/firefly-x/parallel-erasure-code/distros deleted file mode 120000 index ecffa88e4987d..0000000000000 --- a/suites/upgrade/firefly-x/parallel-erasure-code/distros +++ /dev/null @@ -1 +0,0 @@ -../parallel/distros \ No newline at end of file diff --git a/suites/upgrade/firefly-x/parallel/% b/suites/upgrade/firefly-x/parallel/% deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/suites/upgrade/firefly-x/parallel/0-cluster/start.yaml b/suites/upgrade/firefly-x/parallel/0-cluster/start.yaml deleted file mode 100644 index 27e08f394e86c..0000000000000 --- a/suites/upgrade/firefly-x/parallel/0-cluster/start.yaml +++ /dev/null @@ -1,24 +0,0 @@ -roles: -- - mon.a - - mds.a - - osd.0 - - osd.1 -- - mon.b - - mon.c - - osd.2 - - osd.3 -- - client.0 - - client.1 - - client.2 - - client.3 - - client.4 -overrides: - ceph: - log-whitelist: - - scrub mismatch - - ScrubResult - - failed to encode map - conf: - mon: - mon warn on legacy crush tunables: false - mon debug unsafe allow tier with nonempty snaps: true diff --git a/suites/upgrade/firefly-x/parallel/1-firefly-install/firefly.yaml b/suites/upgrade/firefly-x/parallel/1-firefly-install/firefly.yaml deleted file mode 100644 index 9f2813196046d..0000000000000 --- a/suites/upgrade/firefly-x/parallel/1-firefly-install/firefly.yaml +++ /dev/null @@ -1,11 +0,0 @@ -tasks: -- install: - branch: firefly -- print: "**** done installing firefly" -- ceph: - fs: xfs -- print: "**** done ceph" -- parallel: - - workload - - upgrade-sequence -- print: "**** done parallel" diff --git a/suites/upgrade/firefly-x/parallel/2-workload/+ b/suites/upgrade/firefly-x/parallel/2-workload/+ deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/suites/upgrade/firefly-x/parallel/2-workload/ec-rados-parallel.yaml b/suites/upgrade/firefly-x/parallel/2-workload/ec-rados-parallel.yaml deleted file mode 120000 index c4de249ed96a1..0000000000000 --- a/suites/upgrade/firefly-x/parallel/2-workload/ec-rados-parallel.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../../erasure-code/ec-rados-parallel.yaml \ No newline at end of file diff --git a/suites/upgrade/firefly-x/parallel/2-workload/rados_api.yaml b/suites/upgrade/firefly-x/parallel/2-workload/rados_api.yaml deleted file mode 100644 index f8c18a3cb7ef4..0000000000000 --- a/suites/upgrade/firefly-x/parallel/2-workload/rados_api.yaml +++ /dev/null @@ -1,8 +0,0 @@ -workload: - parallel: - - workunit: - branch: firefly - clients: - client.1: - - cls - - print: "**** done cls 2-workload" diff --git a/suites/upgrade/firefly-x/parallel/2-workload/rados_loadgenbig.yaml b/suites/upgrade/firefly-x/parallel/2-workload/rados_loadgenbig.yaml deleted file mode 100644 index 6f1429acb7760..0000000000000 --- a/suites/upgrade/firefly-x/parallel/2-workload/rados_loadgenbig.yaml +++ /dev/null @@ -1,8 +0,0 @@ -workload: - parallel: - - workunit: - branch: firefly - clients: - client.2: - - rados/load-gen-big.sh - - print: "**** done rados/load-gen-big.sh 2-workload" diff --git a/suites/upgrade/firefly-x/parallel/2-workload/test_rbd_api.yaml b/suites/upgrade/firefly-x/parallel/2-workload/test_rbd_api.yaml deleted file mode 100644 index 0339c57509632..0000000000000 --- a/suites/upgrade/firefly-x/parallel/2-workload/test_rbd_api.yaml +++ /dev/null @@ -1,8 +0,0 @@ -workload: - parallel: - - workunit: - branch: firefly - clients: - client.3: - - rbd/test_librbd.sh - - print: "**** done rbd/test_librbd.sh 2-workload" diff --git a/suites/upgrade/firefly-x/parallel/2-workload/test_rbd_python.yaml b/suites/upgrade/firefly-x/parallel/2-workload/test_rbd_python.yaml deleted file mode 100644 index fce9039ed4102..0000000000000 --- a/suites/upgrade/firefly-x/parallel/2-workload/test_rbd_python.yaml +++ /dev/null @@ -1,8 +0,0 @@ -workload: - parallel: - - workunit: - branch: firefly - clients: - client.4: - - rbd/test_librbd_python.sh - - print: "**** done rbd/test_librbd_python.sh 2-workload" diff --git a/suites/upgrade/firefly-x/parallel/3-upgrade-sequence/upgrade-all.yaml b/suites/upgrade/firefly-x/parallel/3-upgrade-sequence/upgrade-all.yaml deleted file mode 100644 index f5d10cdfcaba8..0000000000000 --- a/suites/upgrade/firefly-x/parallel/3-upgrade-sequence/upgrade-all.yaml +++ /dev/null @@ -1,6 +0,0 @@ -upgrade-sequence: - sequential: - - install.upgrade: - mon.a: - mon.b: - - ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3] diff --git a/suites/upgrade/firefly-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/firefly-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml deleted file mode 100644 index 95199e0588fdf..0000000000000 --- a/suites/upgrade/firefly-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml +++ /dev/null @@ -1,35 +0,0 @@ -upgrade-sequence: - 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 firefly - - 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-x/parallel/4-final-workload/+ b/suites/upgrade/firefly-x/parallel/4-final-workload/+ deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/suites/upgrade/firefly-x/parallel/4-final-workload/rados-snaps-few-objects.yaml b/suites/upgrade/firefly-x/parallel/4-final-workload/rados-snaps-few-objects.yaml deleted file mode 100644 index 112260734b0bc..0000000000000 --- a/suites/upgrade/firefly-x/parallel/4-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 rados 4-final-workload" diff --git a/suites/upgrade/firefly-x/parallel/4-final-workload/rados_loadgenmix.yaml b/suites/upgrade/firefly-x/parallel/4-final-workload/rados_loadgenmix.yaml deleted file mode 100644 index d4a8006e906bf..0000000000000 --- a/suites/upgrade/firefly-x/parallel/4-final-workload/rados_loadgenmix.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: - - workunit: - clients: - client.1: - - rados/load-gen-mix.sh - - print: "**** done rados/load-gen-mix.sh 4-final-workload" diff --git a/suites/upgrade/firefly-x/parallel/4-final-workload/rados_mon_thrash.yaml b/suites/upgrade/firefly-x/parallel/4-final-workload/rados_mon_thrash.yaml deleted file mode 100644 index 9f18679370cbe..0000000000000 --- a/suites/upgrade/firefly-x/parallel/4-final-workload/rados_mon_thrash.yaml +++ /dev/null @@ -1,11 +0,0 @@ -tasks: - - mon_thrash: - revive_delay: 20 - thrash_delay: 1 - - print: "**** done mon_thrash 4-final-workload" - - workunit: - branch: firefly - clients: - client.1: - - rados/test-upgrade-v9.0.1.sh - - print: "**** done rados/test-upgrade-v9.0.1.sh 4-final-workload" diff --git a/suites/upgrade/firefly-x/parallel/4-final-workload/rbd_cls.yaml b/suites/upgrade/firefly-x/parallel/4-final-workload/rbd_cls.yaml deleted file mode 100644 index ed75230497d09..0000000000000 --- a/suites/upgrade/firefly-x/parallel/4-final-workload/rbd_cls.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: - - workunit: - clients: - client.1: - - cls/test_cls_rbd.sh - - print: "**** done cls/test_cls_rbd.sh 4-final-workload" diff --git a/suites/upgrade/firefly-x/parallel/4-final-workload/rbd_import_export.yaml b/suites/upgrade/firefly-x/parallel/4-final-workload/rbd_import_export.yaml deleted file mode 100644 index 2c66c28a2767a..0000000000000 --- a/suites/upgrade/firefly-x/parallel/4-final-workload/rbd_import_export.yaml +++ /dev/null @@ -1,8 +0,0 @@ -tasks: - - workunit: - clients: - client.1: - - rbd/import_export.sh - env: - RBD_CREATE_ARGS: --new-format - - print: "**** done rbd/import_export.sh 4-final-workload" diff --git a/suites/upgrade/firefly-x/parallel/4-final-workload/rgw_swift.yaml b/suites/upgrade/firefly-x/parallel/4-final-workload/rgw_swift.yaml deleted file mode 100644 index 18089bec6ddd0..0000000000000 --- a/suites/upgrade/firefly-x/parallel/4-final-workload/rgw_swift.yaml +++ /dev/null @@ -1,7 +0,0 @@ -tasks: - - rgw: [client.1] - - print: "**** done rgw 4-final-workload" - - swift: - client.1: - rgw_server: client.1 - - print: "**** done swift 4-final-workload" diff --git a/suites/upgrade/firefly-x/parallel/distros b/suites/upgrade/firefly-x/parallel/distros deleted file mode 120000 index 79010c36a5998..0000000000000 --- a/suites/upgrade/firefly-x/parallel/distros +++ /dev/null @@ -1 +0,0 @@ -../../../../distros/supported \ No newline at end of file diff --git a/suites/upgrade/firefly-x/singleton/versions-steps-x/% b/suites/upgrade/firefly-x/singleton/versions-steps-x/% deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/suites/upgrade/firefly-x/singleton/versions-steps-x/distros b/suites/upgrade/firefly-x/singleton/versions-steps-x/distros deleted file mode 120000 index ea78f6570e5da..0000000000000 --- a/suites/upgrade/firefly-x/singleton/versions-steps-x/distros +++ /dev/null @@ -1 +0,0 @@ -../../../../../distros/supported/ \ No newline at end of file diff --git a/suites/upgrade/firefly-x/singleton/versions-steps-x/versions-steps-x.yaml b/suites/upgrade/firefly-x/singleton/versions-steps-x/versions-steps-x.yaml deleted file mode 100644 index b13907798b9a1..0000000000000 --- a/suites/upgrade/firefly-x/singleton/versions-steps-x/versions-steps-x.yaml +++ /dev/null @@ -1,365 +0,0 @@ -overrides: - ceph: - log-whitelist: - - scrub - - osd_map_max_advance - fs: xfs - conf: - osd: - osd map max advance: 1000 -roles: -- - mon.a - - mds.a - - osd.0 - - osd.1 - - osd.2 -- - mon.b - - mon.c - - osd.3 - - osd.4 - - osd.5 - - client.0 -- - client.1 -tasks: -- install: - tag: v0.80.4 -- print: "**** done v0.80.4 install" -- ceph: - fs: xfs -- print: "**** done ceph xfs" -- sequential: - - workload -- print: "**** done workload v0.80.4" -- parallel: - - workload1 - - upgrade-sequence1 -- print: "**** done parallel v0.80.5" -- parallel: - - workload2 - - upgrade-sequence2 -- print: "**** done parallel v0.80.7" -- parallel: - - workload3 - - upgrade-sequence3 -- print: "**** done parallel v0.80.8" -- parallel: - - workload4 - - upgrade-sequence4 -- print: "**** done parallel v0.80.9" -- parallel: - - workload_firefly - - upgrade-sequence_firefly -- print: "**** done parallel firefly" -- parallel: - - workload-x - - upgrade-sequence-x -- print: "**** done parallel -x branch" -####################### -workload: - workunit: - clients: - client.0: - - suites/blogbench.sh -workload1: - sequential: - - workunit: - clients: - client.0: - - rados/load-gen-big.sh - - print: "**** done rados/load-gen-big.sh" - - workunit: - clients: - client.0: - - rados/test.sh - - cls - - print: "**** done rados/test.sh & cls" - - workunit: - clients: - client.0: - - rbd/test_librbd.sh - - print: "**** done rbd/test_librbd.sh" -upgrade-sequence1: - sequential: - - install.upgrade: - mon.a: - tag: v0.80.5 - mon.b: - tag: v0.80.5 - client.1: - tag: v0.80.5 - - print: "**** done v0.80.5 install.upgrade" - - 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 - - print: "**** done ceph.restart all 1 mon/mds/osd" -workload2: - sequential: -# removed to fix #10176 -# - workunit: -# clients: -# client.0: -# - rbd/import_export.sh -# env: -# RBD_CREATE_ARGS: --new-format - - workunit: - clients: - client.0: - - cls/test_cls_rbd.sh - - print: "**** done cls/test_cls_rbd.sh workload2" -upgrade-sequence2: - sequential: - - install.upgrade: - mon.a: - tag: v0.80.7 - mon.b: - tag: v0.80.7 - client.1: - tag: v0.80.7 - - print: "**** done v0.80.7 install.upgrade" - - 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 - - print: "**** done ceph.restart all 2 osd/mon/mds" -workload3: - sequential: - - workunit: - clients: - client.0: - - cls/test_cls_rbd.sh - - print: "**** done cls/test_cls_rbd.sh workload3" -upgrade-sequence3: - sequential: - - install.upgrade: - mon.a: - tag: v0.80.8 - mon.b: - tag: v0.80.8 - client.1: - tag: v0.80.8 - - print: "**** done v0.80.8 install.upgrade" - - 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 - - print: "**** done ceph.restart all 3 osd/mon/mds" -workload4: - sequential: - - workunit: - clients: - client.0: - - rados/load-gen-big.sh - - print: "**** done rados/load-gen-big.sh workload4" - - workunit: - clients: - client.0: - - rados/test.sh - - cls - - print: "**** done rados/test.sh & cls workload4" - - workunit: - clients: - client.0: - - rbd/test_librbd.sh - - print: "**** done rbd/test_librbd.sh workload4" -upgrade-sequence4: - sequential: - - install.upgrade: - mon.a: - tag: v0.80.9 - mon.b: - tag: v0.80.9 - client.1: - tag: v0.80.9 - - print: "**** done v0.80.9 install.upgrade" - - 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 - - print: "**** done ceph.restart all 1 mon/mds/osd upgrade-sequence4" -workload_firefly: - rados: - clients: [client.0] - ops: 2000 - objects: 50 - op_weights: - read: 100 - write: 100 - delete: 50 - snap_create: 50 - snap_remove: 50 - rollback: 50 -upgrade-sequence_firefly: - sequential: - - install.upgrade: - mon.a: - branch: firefly - mon.b: - branch: firefly - client.1: - branch: firefly - - print: "**** done branch: firefly install.upgrade" - - ceph.restart: - daemons: [osd.0, osd.1, osd.2, osd.3, osd.4, osd.5] - - sleep: - duration: 60 - - ceph.restart: - daemons: [mon.a, mon.b, mon.c] - - sleep: - duration: 60 - - ceph.restart: [mds.a] - - sleep: - duration: 60 - - print: "**** done ceph.restart daemons grouped" -workload-x: - sequential: - - rgw: [client.0] - - s3tests: - client.0: - force-branch: firefly - rgw_server: client.0 -upgrade-sequence-x: - sequential: - - install.upgrade: - mon.a: - #branch: firefly - mon.b: - #branch: firefly - client.1: - #branch: firefly - - print: "**** done branch: -x install.upgrade" - - 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: 60 - - ceph.restart: [mon.a] - - sleep: - duration: 60 - - ceph.restart: [mon.b] - - sleep: - duration: 60 - - ceph.restart: [mon.c] - - sleep: - duration: 60 - - print: "**** done ceph.restart all -x branch mds/osd/mon" diff --git a/suites/upgrade/firefly-x/stress-split-erasure-code/% b/suites/upgrade/firefly-x/stress-split-erasure-code/% deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/suites/upgrade/firefly-x/stress-split-erasure-code/0-cluster/start.yaml b/suites/upgrade/firefly-x/stress-split-erasure-code/0-cluster/start.yaml deleted file mode 100644 index 9ea0a27f82a2f..0000000000000 --- a/suites/upgrade/firefly-x/stress-split-erasure-code/0-cluster/start.yaml +++ /dev/null @@ -1,25 +0,0 @@ -overrides: - ceph: - conf: - mon: - mon warn on legacy crush tunables: false -roles: -- - mon.a - - mon.b - - mon.c - - mds.a - - osd.0 - - osd.1 - - osd.2 - - osd.3 - - osd.4 - - osd.5 - - osd.6 -- - osd.7 - - osd.8 - - osd.9 - - osd.10 - - osd.11 - - osd.12 - - osd.13 -- - client.0 diff --git a/suites/upgrade/firefly-x/stress-split-erasure-code/1-firefly-install/firefly.yaml b/suites/upgrade/firefly-x/stress-split-erasure-code/1-firefly-install/firefly.yaml deleted file mode 100644 index a3573817aa0aa..0000000000000 --- a/suites/upgrade/firefly-x/stress-split-erasure-code/1-firefly-install/firefly.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tasks: -- install: - branch: firefly -- ceph: - fs: xfs diff --git a/suites/upgrade/firefly-x/stress-split-erasure-code/2-workload/ec-cache-create.yaml b/suites/upgrade/firefly-x/stress-split-erasure-code/2-workload/ec-cache-create.yaml deleted file mode 100644 index cddf366ebcd25..0000000000000 --- a/suites/upgrade/firefly-x/stress-split-erasure-code/2-workload/ec-cache-create.yaml +++ /dev/null @@ -1,33 +0,0 @@ -overrides: - ceph: - crush_tunables: firefly - log-whitelist: - - must scrub before tier agent can activate -tasks: -- exec: - client.0: - - sudo ceph osd erasure-code-profile set teuthologyprofile ruleset-failure-domain=osd k=2 m=1 - - sudo ceph osd pool create ecbase 4 4 erasure teuthologyprofile - - sudo ceph osd pool create eccache 4 - - sudo ceph osd tier add ecbase eccache - - sudo ceph osd tier cache-mode eccache writeback - - sudo ceph osd tier set-overlay ecbase eccache - - sudo ceph osd pool set eccache hit_set_type bloom - - sudo ceph osd pool set eccache hit_set_count 8 - - sudo ceph osd pool set eccache hit_set_period 60 - - sudo ceph osd pool set eccache target_max_objects 250 -- exec: - client.0: - - sudo ceph osd deep-scrub '*' -- sequential: - - rados: - clients: [client.0] - pools: [ecbase] - ops: 4000 - objects: 500 - op_weights: - read: 100 - write: 100 - delete: 50 - copy_from: 50 -- print: "**** done rados ec-cache-agent (part 1)" diff --git a/suites/upgrade/firefly-x/stress-split-erasure-code/3-partial-upgrade/firsthalf.yaml b/suites/upgrade/firefly-x/stress-split-erasure-code/3-partial-upgrade/firsthalf.yaml deleted file mode 100644 index 43526c48b6bc5..0000000000000 --- a/suites/upgrade/firefly-x/stress-split-erasure-code/3-partial-upgrade/firsthalf.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tasks: -- install.upgrade: - osd.0: -- ceph.restart: - daemons: [osd.0, osd.1, osd.2, osd.3, osd.4, osd.5, osd.6] diff --git a/suites/upgrade/firefly-x/stress-split-erasure-code/4-thrash/default.yaml b/suites/upgrade/firefly-x/stress-split-erasure-code/4-thrash/default.yaml deleted file mode 100644 index f41b9be4b025f..0000000000000 --- a/suites/upgrade/firefly-x/stress-split-erasure-code/4-thrash/default.yaml +++ /dev/null @@ -1,12 +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 - min_in: 4 diff --git a/suites/upgrade/firefly-x/stress-split-erasure-code/5-mon/mona.yaml b/suites/upgrade/firefly-x/stress-split-erasure-code/5-mon/mona.yaml deleted file mode 100644 index b6ffb3323d11e..0000000000000 --- a/suites/upgrade/firefly-x/stress-split-erasure-code/5-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/firefly-x/stress-split-erasure-code/6-workload/ec-cache-agent.yaml b/suites/upgrade/firefly-x/stress-split-erasure-code/6-workload/ec-cache-agent.yaml deleted file mode 100644 index 501a12ee5353e..0000000000000 --- a/suites/upgrade/firefly-x/stress-split-erasure-code/6-workload/ec-cache-agent.yaml +++ /dev/null @@ -1,16 +0,0 @@ -tasks: -- exec: - client.0: - - sudo ceph osd deep-scrub '*' -- sequential: - - rados: - clients: [client.0] - pools: [ecbase] - ops: 4000 - objects: 500 - op_weights: - read: 100 - write: 100 - delete: 50 - copy_from: 50 -- print: "**** done rados ec-cache-agent (part 2)" diff --git a/suites/upgrade/firefly-x/stress-split-erasure-code/6-workload/ec-rados-default.yaml b/suites/upgrade/firefly-x/stress-split-erasure-code/6-workload/ec-rados-default.yaml deleted file mode 120000 index a8a0ae69405a0..0000000000000 --- a/suites/upgrade/firefly-x/stress-split-erasure-code/6-workload/ec-rados-default.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../../erasure-code/ec-rados-default.yaml \ No newline at end of file diff --git a/suites/upgrade/firefly-x/stress-split-erasure-code/7-next-mon/monb.yaml b/suites/upgrade/firefly-x/stress-split-erasure-code/7-next-mon/monb.yaml deleted file mode 100644 index 513890c41c015..0000000000000 --- a/suites/upgrade/firefly-x/stress-split-erasure-code/7-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/firefly-x/stress-split-erasure-code/8-next-mon/monc.yaml b/suites/upgrade/firefly-x/stress-split-erasure-code/8-next-mon/monc.yaml deleted file mode 100644 index e9273236ba331..0000000000000 --- a/suites/upgrade/firefly-x/stress-split-erasure-code/8-next-mon/monc.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- 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/firefly-x/stress-split-erasure-code/9-workload/ec-no-lrc.yaml b/suites/upgrade/firefly-x/stress-split-erasure-code/9-workload/ec-no-lrc.yaml deleted file mode 100644 index 566406546ca60..0000000000000 --- a/suites/upgrade/firefly-x/stress-split-erasure-code/9-workload/ec-no-lrc.yaml +++ /dev/null @@ -1,9 +0,0 @@ -# -# The lrc plugin cannot be used because some OSD are not upgraded -# yet and would crash. -# -tasks: -- exec: - mon.a: - - |- - sudo ceph osd erasure-code-profile set profile-lrc plugin=lrc 2>&1 | grep "unsupported by:" diff --git a/suites/upgrade/firefly-x/stress-split-erasure-code/9-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml b/suites/upgrade/firefly-x/stress-split-erasure-code/9-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml deleted file mode 120000 index 4b9d9a44a245d..0000000000000 --- a/suites/upgrade/firefly-x/stress-split-erasure-code/9-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-x/stress-split-erasure-code/distros b/suites/upgrade/firefly-x/stress-split-erasure-code/distros deleted file mode 120000 index 79010c36a5998..0000000000000 --- a/suites/upgrade/firefly-x/stress-split-erasure-code/distros +++ /dev/null @@ -1 +0,0 @@ -../../../../distros/supported \ No newline at end of file diff --git a/suites/upgrade/firefly-x/stress-split/% b/suites/upgrade/firefly-x/stress-split/% deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/suites/upgrade/firefly-x/stress-split/0-cluster/start.yaml b/suites/upgrade/firefly-x/stress-split/0-cluster/start.yaml deleted file mode 100644 index 6bf44d8a1df75..0000000000000 --- a/suites/upgrade/firefly-x/stress-split/0-cluster/start.yaml +++ /dev/null @@ -1,28 +0,0 @@ -overrides: - ceph: - log-whitelist: - - Missing health data for MDS - - failed to encode map - conf: - mon: - mon warn on legacy crush tunables: false -roles: -- - mon.a - - mon.b - - mon.c - - mds.a - - osd.0 - - osd.1 - - osd.2 - - osd.3 - - osd.4 - - osd.5 - - osd.6 -- - osd.7 - - osd.8 - - osd.9 - - osd.10 - - osd.11 - - osd.12 - - osd.13 -- - client.0 diff --git a/suites/upgrade/firefly-x/stress-split/1-firefly-install/firefly.yaml b/suites/upgrade/firefly-x/stress-split/1-firefly-install/firefly.yaml deleted file mode 100644 index a3573817aa0aa..0000000000000 --- a/suites/upgrade/firefly-x/stress-split/1-firefly-install/firefly.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tasks: -- install: - branch: firefly -- ceph: - fs: xfs diff --git a/suites/upgrade/firefly-x/stress-split/2-partial-upgrade/firsthalf.yaml b/suites/upgrade/firefly-x/stress-split/2-partial-upgrade/firsthalf.yaml deleted file mode 100644 index 52ab10fe78090..0000000000000 --- a/suites/upgrade/firefly-x/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, osd.3, osd.4, osd.5, osd.6] diff --git a/suites/upgrade/firefly-x/stress-split/3-thrash/default.yaml b/suites/upgrade/firefly-x/stress-split/3-thrash/default.yaml deleted file mode 100644 index 21d4c7520759d..0000000000000 --- a/suites/upgrade/firefly-x/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/firefly-x/stress-split/4-mon/mona.yaml b/suites/upgrade/firefly-x/stress-split/4-mon/mona.yaml deleted file mode 100644 index b6ffb3323d11e..0000000000000 --- a/suites/upgrade/firefly-x/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/firefly-x/stress-split/5-workload/+ b/suites/upgrade/firefly-x/stress-split/5-workload/+ deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/suites/upgrade/firefly-x/stress-split/5-workload/rbd-cls.yaml b/suites/upgrade/firefly-x/stress-split/5-workload/rbd-cls.yaml deleted file mode 100644 index 46c61b49a7636..0000000000000 --- a/suites/upgrade/firefly-x/stress-split/5-workload/rbd-cls.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- workunit: - branch: firefly - clients: - client.0: - - cls/test_cls_rbd.sh diff --git a/suites/upgrade/firefly-x/stress-split/5-workload/rbd-import-export.yaml b/suites/upgrade/firefly-x/stress-split/5-workload/rbd-import-export.yaml deleted file mode 100644 index 7fddb418a5668..0000000000000 --- a/suites/upgrade/firefly-x/stress-split/5-workload/rbd-import-export.yaml +++ /dev/null @@ -1,8 +0,0 @@ -tasks: -- workunit: - branch: firefly - clients: - client.0: - - rbd/import_export.sh - env: - RBD_CREATE_ARGS: --new-format diff --git a/suites/upgrade/firefly-x/stress-split/5-workload/readwrite.yaml b/suites/upgrade/firefly-x/stress-split/5-workload/readwrite.yaml deleted file mode 100644 index c53e52b0872b6..0000000000000 --- a/suites/upgrade/firefly-x/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/firefly-x/stress-split/5-workload/snaps-few-objects.yaml b/suites/upgrade/firefly-x/stress-split/5-workload/snaps-few-objects.yaml deleted file mode 100644 index c54039766c0b7..0000000000000 --- a/suites/upgrade/firefly-x/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/firefly-x/stress-split/6-next-mon/monb.yaml b/suites/upgrade/firefly-x/stress-split/6-next-mon/monb.yaml deleted file mode 100644 index 513890c41c015..0000000000000 --- a/suites/upgrade/firefly-x/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/firefly-x/stress-split/7-workload/+ b/suites/upgrade/firefly-x/stress-split/7-workload/+ deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/suites/upgrade/firefly-x/stress-split/7-workload/radosbench.yaml b/suites/upgrade/firefly-x/stress-split/7-workload/radosbench.yaml deleted file mode 100644 index 3940870fce0f9..0000000000000 --- a/suites/upgrade/firefly-x/stress-split/7-workload/radosbench.yaml +++ /dev/null @@ -1,4 +0,0 @@ -tasks: -- radosbench: - clients: [client.0] - time: 1800 diff --git a/suites/upgrade/firefly-x/stress-split/7-workload/rbd_api.yaml b/suites/upgrade/firefly-x/stress-split/7-workload/rbd_api.yaml deleted file mode 100644 index be46ba0a25c1f..0000000000000 --- a/suites/upgrade/firefly-x/stress-split/7-workload/rbd_api.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- workunit: - branch: firefly - clients: - client.0: - - rbd/test_librbd.sh diff --git a/suites/upgrade/firefly-x/stress-split/8-next-mon/monc.yaml b/suites/upgrade/firefly-x/stress-split/8-next-mon/monc.yaml deleted file mode 100644 index e9273236ba331..0000000000000 --- a/suites/upgrade/firefly-x/stress-split/8-next-mon/monc.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- 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/firefly-x/stress-split/9-workload/+ b/suites/upgrade/firefly-x/stress-split/9-workload/+ deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/suites/upgrade/firefly-x/stress-split/9-workload/rbd-python.yaml b/suites/upgrade/firefly-x/stress-split/9-workload/rbd-python.yaml deleted file mode 100644 index 5b5412661eec2..0000000000000 --- a/suites/upgrade/firefly-x/stress-split/9-workload/rbd-python.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- workunit: - branch: firefly - clients: - client.0: - - rbd/test_librbd_python.sh diff --git a/suites/upgrade/firefly-x/stress-split/9-workload/rgw-swift.yaml b/suites/upgrade/firefly-x/stress-split/9-workload/rgw-swift.yaml deleted file mode 100644 index bfaae1a943f27..0000000000000 --- a/suites/upgrade/firefly-x/stress-split/9-workload/rgw-swift.yaml +++ /dev/null @@ -1,7 +0,0 @@ -tasks: -- rgw: - client.0: - default_idle_timeout: 300 -- swift: - client.0: - rgw_server: client.0 diff --git a/suites/upgrade/firefly-x/stress-split/9-workload/snaps-many-objects.yaml b/suites/upgrade/firefly-x/stress-split/9-workload/snaps-many-objects.yaml deleted file mode 100644 index 9e311c946e1a4..0000000000000 --- a/suites/upgrade/firefly-x/stress-split/9-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/firefly-x/stress-split/distros b/suites/upgrade/firefly-x/stress-split/distros deleted file mode 120000 index 79010c36a5998..0000000000000 --- a/suites/upgrade/firefly-x/stress-split/distros +++ /dev/null @@ -1 +0,0 @@ -../../../../distros/supported \ No newline at end of file diff --git a/suites/upgrade/giant-x/parallel/% b/suites/upgrade/giant-x/parallel/% deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/suites/upgrade/giant-x/parallel/0-cluster/start.yaml b/suites/upgrade/giant-x/parallel/0-cluster/start.yaml deleted file mode 100644 index 27e08f394e86c..0000000000000 --- a/suites/upgrade/giant-x/parallel/0-cluster/start.yaml +++ /dev/null @@ -1,24 +0,0 @@ -roles: -- - mon.a - - mds.a - - osd.0 - - osd.1 -- - mon.b - - mon.c - - osd.2 - - osd.3 -- - client.0 - - client.1 - - client.2 - - client.3 - - client.4 -overrides: - ceph: - log-whitelist: - - scrub mismatch - - ScrubResult - - failed to encode map - conf: - mon: - mon warn on legacy crush tunables: false - mon debug unsafe allow tier with nonempty snaps: true diff --git a/suites/upgrade/giant-x/parallel/1-giant-install/giant.yaml b/suites/upgrade/giant-x/parallel/1-giant-install/giant.yaml deleted file mode 100644 index b09a6b74b3d09..0000000000000 --- a/suites/upgrade/giant-x/parallel/1-giant-install/giant.yaml +++ /dev/null @@ -1,11 +0,0 @@ -tasks: -- install: - branch: giant -- print: "**** done installing giant" -- ceph: - fs: xfs -- print: "**** done ceph" -- parallel: - - workload - - upgrade-sequence -- print: "**** done parallel" diff --git a/suites/upgrade/giant-x/parallel/2-workload/parallel_run/+ b/suites/upgrade/giant-x/parallel/2-workload/parallel_run/+ deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/suites/upgrade/giant-x/parallel/2-workload/parallel_run/ec-rados-parallel.yaml b/suites/upgrade/giant-x/parallel/2-workload/parallel_run/ec-rados-parallel.yaml deleted file mode 120000 index 64b3cabfb0c3d..0000000000000 --- a/suites/upgrade/giant-x/parallel/2-workload/parallel_run/ec-rados-parallel.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../../../erasure-code/ec-rados-parallel.yaml \ No newline at end of file diff --git a/suites/upgrade/giant-x/parallel/2-workload/parallel_run/rados_api.yaml b/suites/upgrade/giant-x/parallel/2-workload/parallel_run/rados_api.yaml deleted file mode 100644 index 3fa120f11f9f2..0000000000000 --- a/suites/upgrade/giant-x/parallel/2-workload/parallel_run/rados_api.yaml +++ /dev/null @@ -1,8 +0,0 @@ -workload: - parallel: - - workunit: - branch: giant - clients: - client.1: - - cls - - print: "**** done cls 2-workload parallel" diff --git a/suites/upgrade/giant-x/parallel/2-workload/parallel_run/rados_loadgenbig.yaml b/suites/upgrade/giant-x/parallel/2-workload/parallel_run/rados_loadgenbig.yaml deleted file mode 100644 index 976ef726bf7bd..0000000000000 --- a/suites/upgrade/giant-x/parallel/2-workload/parallel_run/rados_loadgenbig.yaml +++ /dev/null @@ -1,8 +0,0 @@ -workload: - parallel: - - workunit: - branch: giant - clients: - client.2: - - rados/load-gen-big.sh - - print: "**** done rados/load-gen-big.sh 2-workload parallel" diff --git a/suites/upgrade/giant-x/parallel/2-workload/parallel_run/test_cache-pool-snaps.yaml b/suites/upgrade/giant-x/parallel/2-workload/parallel_run/test_cache-pool-snaps.yaml deleted file mode 100644 index 99ac5247de215..0000000000000 --- a/suites/upgrade/giant-x/parallel/2-workload/parallel_run/test_cache-pool-snaps.yaml +++ /dev/null @@ -1,36 +0,0 @@ -overrides: - ceph: - log-whitelist: - - must scrub before tier agent can activate -workload: - parallel: - - sequential: - - exec: - client.0: - - sudo ceph osd pool create base 4 - - sudo ceph osd pool create cache 4 - - sudo ceph osd tier add base cache - - sudo ceph osd tier cache-mode cache writeback - - sudo ceph osd tier set-overlay base cache - - sudo ceph osd pool set cache hit_set_type bloom - - sudo ceph osd pool set cache hit_set_count 8 - - sudo ceph osd pool set cache hit_set_period 3600 - - sudo ceph osd pool set cache target_max_objects 250 - - rados: - clients: [client.0] - pools: [base] - ops: 4000 - objects: 500 - pool_snaps: true - op_weights: - read: 100 - write: 100 - delete: 50 - copy_from: 50 - flush: 50 - try_flush: 50 - evict: 50 - snap_create: 50 - snap_remove: 50 - rollback: 50 - - print: "**** done test_cache-pool-snaps 2-workload parallel_run" diff --git a/suites/upgrade/giant-x/parallel/2-workload/parallel_run/test_rbd_api.yaml b/suites/upgrade/giant-x/parallel/2-workload/parallel_run/test_rbd_api.yaml deleted file mode 100644 index 8db5561196cf3..0000000000000 --- a/suites/upgrade/giant-x/parallel/2-workload/parallel_run/test_rbd_api.yaml +++ /dev/null @@ -1,8 +0,0 @@ -workload: - parallel: - - workunit: - branch: giant - clients: - client.3: - - rbd/test_librbd.sh - - print: "**** done rbd/test_librbd.sh 2-workload parallel" diff --git a/suites/upgrade/giant-x/parallel/2-workload/parallel_run/test_rbd_python.yaml b/suites/upgrade/giant-x/parallel/2-workload/parallel_run/test_rbd_python.yaml deleted file mode 100644 index 0e9b05974f9f7..0000000000000 --- a/suites/upgrade/giant-x/parallel/2-workload/parallel_run/test_rbd_python.yaml +++ /dev/null @@ -1,8 +0,0 @@ -workload: - parallel: - - workunit: - branch: giant - clients: - client.4: - - rbd/test_librbd_python.sh - - print: "**** done rbd/test_librbd_python.sh 2-workload parallel" diff --git a/suites/upgrade/giant-x/parallel/2-workload/sequential_run/ec-rados-sequential.yaml b/suites/upgrade/giant-x/parallel/2-workload/sequential_run/ec-rados-sequential.yaml deleted file mode 120000 index 667858608801a..0000000000000 --- a/suites/upgrade/giant-x/parallel/2-workload/sequential_run/ec-rados-sequential.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../../../erasure-code/ec-rados-sequential.yaml \ No newline at end of file diff --git a/suites/upgrade/giant-x/parallel/2-workload/sequential_run/rados_api.yaml b/suites/upgrade/giant-x/parallel/2-workload/sequential_run/rados_api.yaml deleted file mode 100644 index f93306071581a..0000000000000 --- a/suites/upgrade/giant-x/parallel/2-workload/sequential_run/rados_api.yaml +++ /dev/null @@ -1,8 +0,0 @@ -workload: - sequential: - - workunit: - branch: giant - clients: - client.1: - - cls - - print: "**** done cls 2-workload sequential" diff --git a/suites/upgrade/giant-x/parallel/2-workload/sequential_run/rados_loadgenbig.yaml b/suites/upgrade/giant-x/parallel/2-workload/sequential_run/rados_loadgenbig.yaml deleted file mode 100644 index 7330f84fb2742..0000000000000 --- a/suites/upgrade/giant-x/parallel/2-workload/sequential_run/rados_loadgenbig.yaml +++ /dev/null @@ -1,8 +0,0 @@ -workload: - sequential: - - workunit: - branch: giant - clients: - client.2: - - rados/load-gen-big.sh - - print: "**** done rados/load-gen-big.sh 2-workload sequential" diff --git a/suites/upgrade/giant-x/parallel/2-workload/sequential_run/test_cache-pool-snaps.yaml b/suites/upgrade/giant-x/parallel/2-workload/sequential_run/test_cache-pool-snaps.yaml deleted file mode 100644 index 7c8abe384da6e..0000000000000 --- a/suites/upgrade/giant-x/parallel/2-workload/sequential_run/test_cache-pool-snaps.yaml +++ /dev/null @@ -1,35 +0,0 @@ -overrides: - ceph: - log-whitelist: - - must scrub before tier agent can activate -workload: - sequential: - - exec: - client.0: - - sudo ceph osd pool create base 4 - - sudo ceph osd pool create cache 4 - - sudo ceph osd tier add base cache - - sudo ceph osd tier cache-mode cache writeback - - sudo ceph osd tier set-overlay base cache - - sudo ceph osd pool set cache hit_set_type bloom - - sudo ceph osd pool set cache hit_set_count 8 - - sudo ceph osd pool set cache hit_set_period 3600 - - sudo ceph osd pool set cache target_max_objects 250 - - rados: - clients: [client.0] - pools: [base] - ops: 4000 - objects: 500 - pool_snaps: true - op_weights: - read: 100 - write: 100 - delete: 50 - copy_from: 50 - flush: 50 - try_flush: 50 - evict: 50 - snap_create: 50 - snap_remove: 50 - rollback: 50 - - print: "**** done test_cache-pool-snaps 2-workload sequential_run" diff --git a/suites/upgrade/giant-x/parallel/2-workload/sequential_run/test_rbd_api.yaml b/suites/upgrade/giant-x/parallel/2-workload/sequential_run/test_rbd_api.yaml deleted file mode 100644 index d8c1539e8b498..0000000000000 --- a/suites/upgrade/giant-x/parallel/2-workload/sequential_run/test_rbd_api.yaml +++ /dev/null @@ -1,8 +0,0 @@ -workload: - sequential: - - workunit: - branch: giant - clients: - client.3: - - rbd/test_librbd.sh - - print: "**** done rbd/test_librbd.sh 2-workload sequential" diff --git a/suites/upgrade/giant-x/parallel/2-workload/sequential_run/test_rbd_python.yaml b/suites/upgrade/giant-x/parallel/2-workload/sequential_run/test_rbd_python.yaml deleted file mode 100644 index e62bcb5515edc..0000000000000 --- a/suites/upgrade/giant-x/parallel/2-workload/sequential_run/test_rbd_python.yaml +++ /dev/null @@ -1,8 +0,0 @@ -workload: - sequential: - - workunit: - branch: giant - clients: - client.4: - - rbd/test_librbd_python.sh - - print: "**** done rbd/test_librbd_python.sh 2-workload sequential" diff --git a/suites/upgrade/giant-x/parallel/3-upgrade-sequence/upgrade-all.yaml b/suites/upgrade/giant-x/parallel/3-upgrade-sequence/upgrade-all.yaml deleted file mode 100644 index 3f74d7d14a3cc..0000000000000 --- a/suites/upgrade/giant-x/parallel/3-upgrade-sequence/upgrade-all.yaml +++ /dev/null @@ -1,8 +0,0 @@ -upgrade-sequence: - 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/giant-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/giant-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml deleted file mode 100644 index 59ae657b1b119..0000000000000 --- a/suites/upgrade/giant-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml +++ /dev/null @@ -1,37 +0,0 @@ -upgrade-sequence: - 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" -#do we need to use "ceph osd crush tunables giant" ? - - exec: - mon.b: - - sudo ceph osd crush tunables firefly - - print: "**** done ceph osd crush tunables firefly" - - 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/giant-x/parallel/4-final-workload/+ b/suites/upgrade/giant-x/parallel/4-final-workload/+ deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/suites/upgrade/giant-x/parallel/4-final-workload/rados-snaps-few-objects.yaml b/suites/upgrade/giant-x/parallel/4-final-workload/rados-snaps-few-objects.yaml deleted file mode 100644 index 112260734b0bc..0000000000000 --- a/suites/upgrade/giant-x/parallel/4-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 rados 4-final-workload" diff --git a/suites/upgrade/giant-x/parallel/4-final-workload/rados_loadgenmix.yaml b/suites/upgrade/giant-x/parallel/4-final-workload/rados_loadgenmix.yaml deleted file mode 100644 index d4a8006e906bf..0000000000000 --- a/suites/upgrade/giant-x/parallel/4-final-workload/rados_loadgenmix.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: - - workunit: - clients: - client.1: - - rados/load-gen-mix.sh - - print: "**** done rados/load-gen-mix.sh 4-final-workload" diff --git a/suites/upgrade/giant-x/parallel/4-final-workload/rados_mon_thrash.yaml b/suites/upgrade/giant-x/parallel/4-final-workload/rados_mon_thrash.yaml deleted file mode 100644 index fcd6963da410a..0000000000000 --- a/suites/upgrade/giant-x/parallel/4-final-workload/rados_mon_thrash.yaml +++ /dev/null @@ -1,11 +0,0 @@ -tasks: - - mon_thrash: - revive_delay: 20 - thrash_delay: 1 - - print: "**** done mon_thrash 4-final-workload" - - workunit: - branch: giant - clients: - client.1: - - rados/test-upgrade-v9.0.1.sh - - print: "**** done rados/test-upgrade-v9.0.1.sh 4-final-workload" diff --git a/suites/upgrade/giant-x/parallel/4-final-workload/rbd_cls.yaml b/suites/upgrade/giant-x/parallel/4-final-workload/rbd_cls.yaml deleted file mode 100644 index ed75230497d09..0000000000000 --- a/suites/upgrade/giant-x/parallel/4-final-workload/rbd_cls.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: - - workunit: - clients: - client.1: - - cls/test_cls_rbd.sh - - print: "**** done cls/test_cls_rbd.sh 4-final-workload" diff --git a/suites/upgrade/giant-x/parallel/4-final-workload/rbd_import_export.yaml b/suites/upgrade/giant-x/parallel/4-final-workload/rbd_import_export.yaml deleted file mode 100644 index 2c66c28a2767a..0000000000000 --- a/suites/upgrade/giant-x/parallel/4-final-workload/rbd_import_export.yaml +++ /dev/null @@ -1,8 +0,0 @@ -tasks: - - workunit: - clients: - client.1: - - rbd/import_export.sh - env: - RBD_CREATE_ARGS: --new-format - - print: "**** done rbd/import_export.sh 4-final-workload" diff --git a/suites/upgrade/giant-x/parallel/4-final-workload/rgw_swift.yaml b/suites/upgrade/giant-x/parallel/4-final-workload/rgw_swift.yaml deleted file mode 100644 index 18089bec6ddd0..0000000000000 --- a/suites/upgrade/giant-x/parallel/4-final-workload/rgw_swift.yaml +++ /dev/null @@ -1,7 +0,0 @@ -tasks: - - rgw: [client.1] - - print: "**** done rgw 4-final-workload" - - swift: - client.1: - rgw_server: client.1 - - print: "**** done swift 4-final-workload" diff --git a/suites/upgrade/giant-x/parallel/distros b/suites/upgrade/giant-x/parallel/distros deleted file mode 120000 index 79010c36a5998..0000000000000 --- a/suites/upgrade/giant-x/parallel/distros +++ /dev/null @@ -1 +0,0 @@ -../../../../distros/supported \ No newline at end of file diff --git a/suites/upgrade/giant-x/stress-split-erasure-code-x86_64/% b/suites/upgrade/giant-x/stress-split-erasure-code-x86_64/% deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/suites/upgrade/giant-x/stress-split-erasure-code-x86_64/0-cluster b/suites/upgrade/giant-x/stress-split-erasure-code-x86_64/0-cluster deleted file mode 120000 index 6dceffa2f5b6e..0000000000000 --- a/suites/upgrade/giant-x/stress-split-erasure-code-x86_64/0-cluster +++ /dev/null @@ -1 +0,0 @@ -../stress-split/0-cluster \ No newline at end of file diff --git a/suites/upgrade/giant-x/stress-split-erasure-code-x86_64/1-giant-install b/suites/upgrade/giant-x/stress-split-erasure-code-x86_64/1-giant-install deleted file mode 120000 index 2e0b946d2d28b..0000000000000 --- a/suites/upgrade/giant-x/stress-split-erasure-code-x86_64/1-giant-install +++ /dev/null @@ -1 +0,0 @@ -../stress-split/1-giant-install/ \ No newline at end of file diff --git a/suites/upgrade/giant-x/stress-split-erasure-code-x86_64/2-partial-upgrade b/suites/upgrade/giant-x/stress-split-erasure-code-x86_64/2-partial-upgrade deleted file mode 120000 index c3a4e2c28e598..0000000000000 --- a/suites/upgrade/giant-x/stress-split-erasure-code-x86_64/2-partial-upgrade +++ /dev/null @@ -1 +0,0 @@ -../stress-split/2-partial-upgrade \ No newline at end of file diff --git a/suites/upgrade/giant-x/stress-split-erasure-code-x86_64/3-thrash/default.yaml b/suites/upgrade/giant-x/stress-split-erasure-code-x86_64/3-thrash/default.yaml deleted file mode 100644 index a33d4e3f4e6d5..0000000000000 --- a/suites/upgrade/giant-x/stress-split-erasure-code-x86_64/3-thrash/default.yaml +++ /dev/null @@ -1,13 +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 - min_in: 4 -- print: "**** done thrashosds 3-thrash" diff --git a/suites/upgrade/giant-x/stress-split-erasure-code-x86_64/4-mon b/suites/upgrade/giant-x/stress-split-erasure-code-x86_64/4-mon deleted file mode 120000 index 0ea7dd5aa8d59..0000000000000 --- a/suites/upgrade/giant-x/stress-split-erasure-code-x86_64/4-mon +++ /dev/null @@ -1 +0,0 @@ -../stress-split/4-mon \ No newline at end of file diff --git a/suites/upgrade/giant-x/stress-split-erasure-code-x86_64/5-workload/ec-rados-default.yaml b/suites/upgrade/giant-x/stress-split-erasure-code-x86_64/5-workload/ec-rados-default.yaml deleted file mode 120000 index a8a0ae69405a0..0000000000000 --- a/suites/upgrade/giant-x/stress-split-erasure-code-x86_64/5-workload/ec-rados-default.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../../erasure-code/ec-rados-default.yaml \ No newline at end of file diff --git a/suites/upgrade/giant-x/stress-split-erasure-code-x86_64/6-next-mon b/suites/upgrade/giant-x/stress-split-erasure-code-x86_64/6-next-mon deleted file mode 120000 index 0f00e43e5fd6f..0000000000000 --- a/suites/upgrade/giant-x/stress-split-erasure-code-x86_64/6-next-mon +++ /dev/null @@ -1 +0,0 @@ -../stress-split/6-next-mon \ No newline at end of file diff --git a/suites/upgrade/giant-x/stress-split-erasure-code-x86_64/8-next-mon b/suites/upgrade/giant-x/stress-split-erasure-code-x86_64/8-next-mon deleted file mode 120000 index 726c6a47a2e47..0000000000000 --- a/suites/upgrade/giant-x/stress-split-erasure-code-x86_64/8-next-mon +++ /dev/null @@ -1 +0,0 @@ -../stress-split/8-next-mon \ No newline at end of file diff --git a/suites/upgrade/giant-x/stress-split-erasure-code-x86_64/9-workload/ec-rados-plugin=isa-k=2-m=1.yaml b/suites/upgrade/giant-x/stress-split-erasure-code-x86_64/9-workload/ec-rados-plugin=isa-k=2-m=1.yaml deleted file mode 100644 index 75c6275fdf729..0000000000000 --- a/suites/upgrade/giant-x/stress-split-erasure-code-x86_64/9-workload/ec-rados-plugin=isa-k=2-m=1.yaml +++ /dev/null @@ -1,25 +0,0 @@ -tasks: -- rados: - clients: [client.0] - ops: 4000 - objects: 50 - ec_pool: true - erasure_code_profile: - name: isaprofile - plugin: isa - k: 2 - m: 1 - technique: reed_sol_van - ruleset-failure-domain: osd - op_weights: - read: 100 - write: 0 - append: 100 - delete: 50 - snap_create: 50 - snap_remove: 50 - rollback: 50 - copy_from: 50 - setattr: 25 - rmattr: 25 -- print: "**** done ec-rados-plugin=isa-k=2-m=1 9-workload" diff --git a/suites/upgrade/giant-x/stress-split-erasure-code-x86_64/distros/rhel_7.0.yaml b/suites/upgrade/giant-x/stress-split-erasure-code-x86_64/distros/rhel_7.0.yaml deleted file mode 100644 index be14f2353402e..0000000000000 --- a/suites/upgrade/giant-x/stress-split-erasure-code-x86_64/distros/rhel_7.0.yaml +++ /dev/null @@ -1,3 +0,0 @@ -os_type: rhel -os_version: "7.0" -arch: x86_64 diff --git a/suites/upgrade/giant-x/stress-split-erasure-code-x86_64/distros/ubuntu_14.04.yaml b/suites/upgrade/giant-x/stress-split-erasure-code-x86_64/distros/ubuntu_14.04.yaml deleted file mode 100644 index 12d479fc32c62..0000000000000 --- a/suites/upgrade/giant-x/stress-split-erasure-code-x86_64/distros/ubuntu_14.04.yaml +++ /dev/null @@ -1,3 +0,0 @@ -os_type: ubuntu -os_version: "14.04" -arch: x86_64 diff --git a/suites/upgrade/giant-x/stress-split-erasure-code/% b/suites/upgrade/giant-x/stress-split-erasure-code/% deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/suites/upgrade/giant-x/stress-split-erasure-code/0-cluster b/suites/upgrade/giant-x/stress-split-erasure-code/0-cluster deleted file mode 120000 index 6dceffa2f5b6e..0000000000000 --- a/suites/upgrade/giant-x/stress-split-erasure-code/0-cluster +++ /dev/null @@ -1 +0,0 @@ -../stress-split/0-cluster \ No newline at end of file diff --git a/suites/upgrade/giant-x/stress-split-erasure-code/1-giant-install b/suites/upgrade/giant-x/stress-split-erasure-code/1-giant-install deleted file mode 120000 index 2e0b946d2d28b..0000000000000 --- a/suites/upgrade/giant-x/stress-split-erasure-code/1-giant-install +++ /dev/null @@ -1 +0,0 @@ -../stress-split/1-giant-install/ \ No newline at end of file diff --git a/suites/upgrade/giant-x/stress-split-erasure-code/2-partial-upgrade b/suites/upgrade/giant-x/stress-split-erasure-code/2-partial-upgrade deleted file mode 120000 index c3a4e2c28e598..0000000000000 --- a/suites/upgrade/giant-x/stress-split-erasure-code/2-partial-upgrade +++ /dev/null @@ -1 +0,0 @@ -../stress-split/2-partial-upgrade \ No newline at end of file diff --git a/suites/upgrade/giant-x/stress-split-erasure-code/3-thrash/default.yaml b/suites/upgrade/giant-x/stress-split-erasure-code/3-thrash/default.yaml deleted file mode 100644 index a33d4e3f4e6d5..0000000000000 --- a/suites/upgrade/giant-x/stress-split-erasure-code/3-thrash/default.yaml +++ /dev/null @@ -1,13 +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 - min_in: 4 -- print: "**** done thrashosds 3-thrash" diff --git a/suites/upgrade/giant-x/stress-split-erasure-code/4-mon b/suites/upgrade/giant-x/stress-split-erasure-code/4-mon deleted file mode 120000 index 0ea7dd5aa8d59..0000000000000 --- a/suites/upgrade/giant-x/stress-split-erasure-code/4-mon +++ /dev/null @@ -1 +0,0 @@ -../stress-split/4-mon \ No newline at end of file diff --git a/suites/upgrade/giant-x/stress-split-erasure-code/5-workload/ec-rados-default.yaml b/suites/upgrade/giant-x/stress-split-erasure-code/5-workload/ec-rados-default.yaml deleted file mode 120000 index a8a0ae69405a0..0000000000000 --- a/suites/upgrade/giant-x/stress-split-erasure-code/5-workload/ec-rados-default.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../../erasure-code/ec-rados-default.yaml \ No newline at end of file diff --git a/suites/upgrade/giant-x/stress-split-erasure-code/6-next-mon b/suites/upgrade/giant-x/stress-split-erasure-code/6-next-mon deleted file mode 120000 index 0f00e43e5fd6f..0000000000000 --- a/suites/upgrade/giant-x/stress-split-erasure-code/6-next-mon +++ /dev/null @@ -1 +0,0 @@ -../stress-split/6-next-mon \ No newline at end of file diff --git a/suites/upgrade/giant-x/stress-split-erasure-code/8-next-mon b/suites/upgrade/giant-x/stress-split-erasure-code/8-next-mon deleted file mode 120000 index 726c6a47a2e47..0000000000000 --- a/suites/upgrade/giant-x/stress-split-erasure-code/8-next-mon +++ /dev/null @@ -1 +0,0 @@ -../stress-split/8-next-mon \ No newline at end of file diff --git a/suites/upgrade/giant-x/stress-split-erasure-code/9-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml b/suites/upgrade/giant-x/stress-split-erasure-code/9-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml deleted file mode 120000 index 4b9d9a44a245d..0000000000000 --- a/suites/upgrade/giant-x/stress-split-erasure-code/9-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/giant-x/stress-split-erasure-code/distros b/suites/upgrade/giant-x/stress-split-erasure-code/distros deleted file mode 120000 index 8d4309788e01e..0000000000000 --- a/suites/upgrade/giant-x/stress-split-erasure-code/distros +++ /dev/null @@ -1 +0,0 @@ -../stress-split/distros \ No newline at end of file diff --git a/suites/upgrade/giant-x/stress-split/% b/suites/upgrade/giant-x/stress-split/% deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/suites/upgrade/giant-x/stress-split/0-cluster/start.yaml b/suites/upgrade/giant-x/stress-split/0-cluster/start.yaml deleted file mode 100644 index c27322a7e9475..0000000000000 --- a/suites/upgrade/giant-x/stress-split/0-cluster/start.yaml +++ /dev/null @@ -1,27 +0,0 @@ -overrides: - ceph: - log-whitelist: - - failed to encode map - conf: - mon: - mon warn on legacy crush tunables: false -roles: -- - mon.a - - mon.b - - mon.c - - mds.a - - osd.0 - - osd.1 - - osd.2 - - osd.3 - - osd.4 - - osd.5 - - osd.6 -- - osd.7 - - osd.8 - - osd.9 - - osd.10 - - osd.11 - - osd.12 - - osd.13 -- - client.0 diff --git a/suites/upgrade/giant-x/stress-split/1-giant-install/giant.yaml b/suites/upgrade/giant-x/stress-split/1-giant-install/giant.yaml deleted file mode 100644 index 3ce313299f765..0000000000000 --- a/suites/upgrade/giant-x/stress-split/1-giant-install/giant.yaml +++ /dev/null @@ -1,7 +0,0 @@ -tasks: -- install: - branch: giant -- print: "**** done install giant" -- ceph: - fs: xfs -- print: "**** done ceph" diff --git a/suites/upgrade/giant-x/stress-split/2-partial-upgrade/firsthalf.yaml b/suites/upgrade/giant-x/stress-split/2-partial-upgrade/firsthalf.yaml deleted file mode 100644 index d42633e6dcb9b..0000000000000 --- a/suites/upgrade/giant-x/stress-split/2-partial-upgrade/firsthalf.yaml +++ /dev/null @@ -1,7 +0,0 @@ -tasks: -- install.upgrade: - osd.0: -- print: "**** done install.upgrade osd.0" -- ceph.restart: - daemons: [osd.0, osd.1, osd.2, osd.3, osd.4, osd.5, osd.6] -- print: "**** done ceph.restart 1st half" diff --git a/suites/upgrade/giant-x/stress-split/3-thrash/default.yaml b/suites/upgrade/giant-x/stress-split/3-thrash/default.yaml deleted file mode 100644 index d99d0c8742046..0000000000000 --- a/suites/upgrade/giant-x/stress-split/3-thrash/default.yaml +++ /dev/null @@ -1,12 +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 -- print: "**** done thrashosds 3-thrash" diff --git a/suites/upgrade/giant-x/stress-split/4-mon/mona.yaml b/suites/upgrade/giant-x/stress-split/4-mon/mona.yaml deleted file mode 100644 index 7c75c102fc4fc..0000000000000 --- a/suites/upgrade/giant-x/stress-split/4-mon/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" diff --git a/suites/upgrade/giant-x/stress-split/5-workload/+ b/suites/upgrade/giant-x/stress-split/5-workload/+ deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/suites/upgrade/giant-x/stress-split/5-workload/rbd-cls.yaml b/suites/upgrade/giant-x/stress-split/5-workload/rbd-cls.yaml deleted file mode 100644 index 9122be01659ed..0000000000000 --- a/suites/upgrade/giant-x/stress-split/5-workload/rbd-cls.yaml +++ /dev/null @@ -1,7 +0,0 @@ -tasks: -- workunit: - branch: giant - clients: - client.0: - - cls/test_cls_rbd.sh -- print: "**** done cls/test_cls_rbd.sh 5-workload" diff --git a/suites/upgrade/giant-x/stress-split/5-workload/rbd-import-export.yaml b/suites/upgrade/giant-x/stress-split/5-workload/rbd-import-export.yaml deleted file mode 100644 index 3c39990dea6a7..0000000000000 --- a/suites/upgrade/giant-x/stress-split/5-workload/rbd-import-export.yaml +++ /dev/null @@ -1,9 +0,0 @@ -tasks: -- workunit: - branch: giant - clients: - client.0: - - rbd/import_export.sh - env: - RBD_CREATE_ARGS: --new-format -- print: "**** done rbd/import_export.sh 5-workload" diff --git a/suites/upgrade/giant-x/stress-split/5-workload/readwrite.yaml b/suites/upgrade/giant-x/stress-split/5-workload/readwrite.yaml deleted file mode 100644 index 37c2148328887..0000000000000 --- a/suites/upgrade/giant-x/stress-split/5-workload/readwrite.yaml +++ /dev/null @@ -1,10 +0,0 @@ -tasks: -- rados: - clients: [client.0] - ops: 4000 - objects: 500 - op_weights: - read: 45 - write: 45 - delete: 10 -- print: "**** done rados/readwrite 5-workload" diff --git a/suites/upgrade/giant-x/stress-split/5-workload/snaps-few-objects.yaml b/suites/upgrade/giant-x/stress-split/5-workload/snaps-few-objects.yaml deleted file mode 100644 index f01232a3cbde9..0000000000000 --- a/suites/upgrade/giant-x/stress-split/5-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 -- print: "**** done rados/snaps-few-objects 5-workload" diff --git a/suites/upgrade/giant-x/stress-split/6-next-mon/monb.yaml b/suites/upgrade/giant-x/stress-split/6-next-mon/monb.yaml deleted file mode 100644 index 22e87c7ad21d1..0000000000000 --- a/suites/upgrade/giant-x/stress-split/6-next-mon/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 6-next-mon" diff --git a/suites/upgrade/giant-x/stress-split/7-workload/+ b/suites/upgrade/giant-x/stress-split/7-workload/+ deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/suites/upgrade/giant-x/stress-split/7-workload/radosbench.yaml b/suites/upgrade/giant-x/stress-split/7-workload/radosbench.yaml deleted file mode 100644 index 3d87bb1c2c54a..0000000000000 --- a/suites/upgrade/giant-x/stress-split/7-workload/radosbench.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tasks: -- radosbench: - clients: [client.0] - time: 1800 -- print: "**** done radosbench 7-workload" diff --git a/suites/upgrade/giant-x/stress-split/7-workload/rbd_api.yaml b/suites/upgrade/giant-x/stress-split/7-workload/rbd_api.yaml deleted file mode 100644 index 85536da0c1b77..0000000000000 --- a/suites/upgrade/giant-x/stress-split/7-workload/rbd_api.yaml +++ /dev/null @@ -1,7 +0,0 @@ -tasks: -- workunit: - branch: giant - clients: - client.0: - - rbd/test_librbd.sh -- print: "**** done rbd/test_librbd.sh 7-workload" diff --git a/suites/upgrade/giant-x/stress-split/8-next-mon/monc.yaml b/suites/upgrade/giant-x/stress-split/8-next-mon/monc.yaml deleted file mode 100644 index 6125368589098..0000000000000 --- a/suites/upgrade/giant-x/stress-split/8-next-mon/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 8-next-mon" -- ceph.wait_for_mon_quorum: [a, b, c] -- print: "**** done wait_for_mon_quorum 8-next-mon" diff --git a/suites/upgrade/giant-x/stress-split/9-workload/+ b/suites/upgrade/giant-x/stress-split/9-workload/+ deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/suites/upgrade/giant-x/stress-split/9-workload/rbd-python.yaml b/suites/upgrade/giant-x/stress-split/9-workload/rbd-python.yaml deleted file mode 100644 index 34ece2940c7f8..0000000000000 --- a/suites/upgrade/giant-x/stress-split/9-workload/rbd-python.yaml +++ /dev/null @@ -1,7 +0,0 @@ -tasks: -- workunit: - branch: giant - clients: - client.0: - - rbd/test_librbd_python.sh -- print: "**** done rbd/test_librbd_python.sh 9-workload" diff --git a/suites/upgrade/giant-x/stress-split/9-workload/rgw-swift.yaml b/suites/upgrade/giant-x/stress-split/9-workload/rgw-swift.yaml deleted file mode 100644 index 8f1416082bbc9..0000000000000 --- a/suites/upgrade/giant-x/stress-split/9-workload/rgw-swift.yaml +++ /dev/null @@ -1,9 +0,0 @@ -tasks: -- rgw: - client.0: - default_idle_timeout: 300 -- print: "**** done rgw 9-workload" -- swift: - client.0: - rgw_server: client.0 -- print: "**** done swift 9-workload" diff --git a/suites/upgrade/giant-x/stress-split/9-workload/snaps-many-objects.yaml b/suites/upgrade/giant-x/stress-split/9-workload/snaps-many-objects.yaml deleted file mode 100644 index 9e311c946e1a4..0000000000000 --- a/suites/upgrade/giant-x/stress-split/9-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/giant-x/stress-split/distros b/suites/upgrade/giant-x/stress-split/distros deleted file mode 120000 index 79010c36a5998..0000000000000 --- a/suites/upgrade/giant-x/stress-split/distros +++ /dev/null @@ -1 +0,0 @@ -../../../../distros/supported \ No newline at end of file