From 8ee41c6fa22c43b016a135ce375b86b668d386eb Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 6 Dec 2016 17:46:10 -0500 Subject: [PATCH] upgrade/hammer-jewel-x: redo stress-split Make this easy: write a singel yaml that does the hammer install, some limited work, then upgardes to jewel. Copy it from the parallel suite. Then, symlink all of the rest from the jewel-x stress-split suite. Signed-off-by: Sage Weil --- .../hammer-jewel-x/stress-split/0-cluster | 1 + .../stress-split/00-cluster/start.yaml | 19 ---- .../01-hammer-install/hammer.yaml | 6 -- .../02-partial-upgrade-jewel/firsthalf.yaml | 8 -- .../stress-split/03-workload/rbd.yaml | 6 -- .../04-mona-upgrade-jewel/mona.yaml | 6 -- .../hammer-jewel-x/stress-split/05-workload/+ | 0 .../stress-split/05-workload/rbd-cls.yaml | 6 -- .../stress-split/05-workload/readwrite.yaml | 11 --- .../06-monb-upgrade-jewel/monb.yaml | 6 -- .../hammer-jewel-x/stress-split/07-workload/+ | 0 .../stress-split/07-workload/radosbench.yaml | 33 ------- .../stress-split/07-workload/rbd_api.yaml | 6 -- .../08-monc-upgrade-jewel/monc.yaml | 8 -- .../stress-split/09-workload/rbd-python.yaml | 7 -- .../hammer-to-jewel.yaml | 89 +++++++++++++++++++ .../10-osds-upgrade-jewel/secondhalf.yaml | 8 -- .../11-workload/snaps-few-objects.yaml | 14 --- .../12-partial-upgrade-x/first.yaml | 7 -- .../13-workload/rados_loadgen_big.yaml | 6 -- .../stress-split/14-mona-upgrade-x/mona.yaml | 6 -- .../15-workload/rbd-import-export.yaml | 8 -- .../stress-split/16-monb-upgrade-x/monb.yaml | 6 -- .../stress-split/17-workload/readwrite.yaml | 11 --- .../stress-split/18-monc-upgrade-x/monc.yaml | 8 -- .../stress-split/19-workload/radosbench.yaml | 33 ------- .../stress-split/2-partial-upgrade | 1 + .../20-osds-upgrade-x/osds_secondhalf.yaml | 11 --- .../stress-split/21-final-workload/+ | 0 .../21-final-workload/rados_stress_watch.yaml | 6 -- .../21-final-workload/rbd_cls_tests.yaml | 6 -- .../21-final-workload/rgw-swift.yaml | 8 -- .../hammer-jewel-x/stress-split/3-thrash | 1 + .../upgrade/hammer-jewel-x/stress-split/4-mon | 1 + .../hammer-jewel-x/stress-split/5-workload | 1 + .../hammer-jewel-x/stress-split/6-next-mon | 1 + .../hammer-jewel-x/stress-split/7-workload | 1 + .../hammer-jewel-x/stress-split/8-next-mon | 1 + .../hammer-jewel-x/stress-split/9-workload | 1 + .../jewel-x/stress-split/0-cluster/start.yaml | 1 - 40 files changed, 98 insertions(+), 261 deletions(-) create mode 120000 suites/upgrade/hammer-jewel-x/stress-split/0-cluster delete mode 100644 suites/upgrade/hammer-jewel-x/stress-split/00-cluster/start.yaml delete mode 100644 suites/upgrade/hammer-jewel-x/stress-split/01-hammer-install/hammer.yaml delete mode 100644 suites/upgrade/hammer-jewel-x/stress-split/02-partial-upgrade-jewel/firsthalf.yaml delete mode 100644 suites/upgrade/hammer-jewel-x/stress-split/03-workload/rbd.yaml delete mode 100644 suites/upgrade/hammer-jewel-x/stress-split/04-mona-upgrade-jewel/mona.yaml delete mode 100644 suites/upgrade/hammer-jewel-x/stress-split/05-workload/+ delete mode 100644 suites/upgrade/hammer-jewel-x/stress-split/05-workload/rbd-cls.yaml delete mode 100644 suites/upgrade/hammer-jewel-x/stress-split/05-workload/readwrite.yaml delete mode 100644 suites/upgrade/hammer-jewel-x/stress-split/06-monb-upgrade-jewel/monb.yaml delete mode 100644 suites/upgrade/hammer-jewel-x/stress-split/07-workload/+ delete mode 100644 suites/upgrade/hammer-jewel-x/stress-split/07-workload/radosbench.yaml delete mode 100644 suites/upgrade/hammer-jewel-x/stress-split/07-workload/rbd_api.yaml delete mode 100644 suites/upgrade/hammer-jewel-x/stress-split/08-monc-upgrade-jewel/monc.yaml delete mode 100644 suites/upgrade/hammer-jewel-x/stress-split/09-workload/rbd-python.yaml create mode 100644 suites/upgrade/hammer-jewel-x/stress-split/1-hammer-install-and-upgrade-to-jewel/hammer-to-jewel.yaml delete mode 100644 suites/upgrade/hammer-jewel-x/stress-split/10-osds-upgrade-jewel/secondhalf.yaml delete mode 100644 suites/upgrade/hammer-jewel-x/stress-split/11-workload/snaps-few-objects.yaml delete mode 100644 suites/upgrade/hammer-jewel-x/stress-split/12-partial-upgrade-x/first.yaml delete mode 100644 suites/upgrade/hammer-jewel-x/stress-split/13-workload/rados_loadgen_big.yaml delete mode 100644 suites/upgrade/hammer-jewel-x/stress-split/14-mona-upgrade-x/mona.yaml delete mode 100644 suites/upgrade/hammer-jewel-x/stress-split/15-workload/rbd-import-export.yaml delete mode 100644 suites/upgrade/hammer-jewel-x/stress-split/16-monb-upgrade-x/monb.yaml delete mode 100644 suites/upgrade/hammer-jewel-x/stress-split/17-workload/readwrite.yaml delete mode 100644 suites/upgrade/hammer-jewel-x/stress-split/18-monc-upgrade-x/monc.yaml delete mode 100644 suites/upgrade/hammer-jewel-x/stress-split/19-workload/radosbench.yaml create mode 120000 suites/upgrade/hammer-jewel-x/stress-split/2-partial-upgrade delete mode 100644 suites/upgrade/hammer-jewel-x/stress-split/20-osds-upgrade-x/osds_secondhalf.yaml delete mode 100644 suites/upgrade/hammer-jewel-x/stress-split/21-final-workload/+ delete mode 100644 suites/upgrade/hammer-jewel-x/stress-split/21-final-workload/rados_stress_watch.yaml delete mode 100644 suites/upgrade/hammer-jewel-x/stress-split/21-final-workload/rbd_cls_tests.yaml delete mode 100644 suites/upgrade/hammer-jewel-x/stress-split/21-final-workload/rgw-swift.yaml create mode 120000 suites/upgrade/hammer-jewel-x/stress-split/3-thrash create mode 120000 suites/upgrade/hammer-jewel-x/stress-split/4-mon create mode 120000 suites/upgrade/hammer-jewel-x/stress-split/5-workload create mode 120000 suites/upgrade/hammer-jewel-x/stress-split/6-next-mon create mode 120000 suites/upgrade/hammer-jewel-x/stress-split/7-workload create mode 120000 suites/upgrade/hammer-jewel-x/stress-split/8-next-mon create mode 120000 suites/upgrade/hammer-jewel-x/stress-split/9-workload diff --git a/suites/upgrade/hammer-jewel-x/stress-split/0-cluster b/suites/upgrade/hammer-jewel-x/stress-split/0-cluster new file mode 120000 index 000000000000..9bb7a0db8152 --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/stress-split/0-cluster @@ -0,0 +1 @@ +../../jewel-x/stress-split/0-cluster \ No newline at end of file diff --git a/suites/upgrade/hammer-jewel-x/stress-split/00-cluster/start.yaml b/suites/upgrade/hammer-jewel-x/stress-split/00-cluster/start.yaml deleted file mode 100644 index 129635fa52a9..000000000000 --- a/suites/upgrade/hammer-jewel-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/hammer-jewel-x/stress-split/01-hammer-install/hammer.yaml b/suites/upgrade/hammer-jewel-x/stress-split/01-hammer-install/hammer.yaml deleted file mode 100644 index 47a1a39026af..000000000000 --- a/suites/upgrade/hammer-jewel-x/stress-split/01-hammer-install/hammer.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- install: - branch: hammer -- ceph: - fs: xfs -- print: "**** done install hammer" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/02-partial-upgrade-jewel/firsthalf.yaml b/suites/upgrade/hammer-jewel-x/stress-split/02-partial-upgrade-jewel/firsthalf.yaml deleted file mode 100644 index 990ccbaa17b5..000000000000 --- a/suites/upgrade/hammer-jewel-x/stress-split/02-partial-upgrade-jewel/firsthalf.yaml +++ /dev/null @@ -1,8 +0,0 @@ -tasks: -- install.upgrade: - osd.0: - branch: jewel -- print: "**** done install.upgrade jewel" -- ceph.restart: - daemons: [osd.0, osd.1, osd.2] -- print: "**** done 02-partial-upgrade-jewel" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/03-workload/rbd.yaml b/suites/upgrade/hammer-jewel-x/stress-split/03-workload/rbd.yaml deleted file mode 100644 index 07541d6b485f..000000000000 --- a/suites/upgrade/hammer-jewel-x/stress-split/03-workload/rbd.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- workunit: - clients: - client.0: - - cls/test_cls_rbd.sh -- print: "**** done 03-workload/rbd.yaml" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/04-mona-upgrade-jewel/mona.yaml b/suites/upgrade/hammer-jewel-x/stress-split/04-mona-upgrade-jewel/mona.yaml deleted file mode 100644 index 991b94f2c257..000000000000 --- a/suites/upgrade/hammer-jewel-x/stress-split/04-mona-upgrade-jewel/mona.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- ceph.restart: - daemons: [mon.a] - wait-for-healthy: false - wait-for-osds-up: true -- print: "*** done restart mon.a 04-mona-upgrade-jewel/mona.yaml" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/05-workload/+ b/suites/upgrade/hammer-jewel-x/stress-split/05-workload/+ deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/suites/upgrade/hammer-jewel-x/stress-split/05-workload/rbd-cls.yaml b/suites/upgrade/hammer-jewel-x/stress-split/05-workload/rbd-cls.yaml deleted file mode 100644 index 507c8f992314..000000000000 --- a/suites/upgrade/hammer-jewel-x/stress-split/05-workload/rbd-cls.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- workunit: - clients: - client.0: - - cls/test_cls_rbd.sh -- print: "**** done 05-workload/rbd-cls.yaml" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/05-workload/readwrite.yaml b/suites/upgrade/hammer-jewel-x/stress-split/05-workload/readwrite.yaml deleted file mode 100644 index cacfde1607c2..000000000000 --- a/suites/upgrade/hammer-jewel-x/stress-split/05-workload/readwrite.yaml +++ /dev/null @@ -1,11 +0,0 @@ -tasks: -- rados: - clients: [client.0] - ops: 4000 - objects: 500 - write_append_excl: false - op_weights: - read: 45 - write: 45 - delete: 10 -- print: "**** done 05-workload/readwrite.yaml" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/06-monb-upgrade-jewel/monb.yaml b/suites/upgrade/hammer-jewel-x/stress-split/06-monb-upgrade-jewel/monb.yaml deleted file mode 100644 index 2368ee398c6a..000000000000 --- a/suites/upgrade/hammer-jewel-x/stress-split/06-monb-upgrade-jewel/monb.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- ceph.restart: - daemons: [mon.b] - wait-for-healthy: false - wait-for-osds-up: true -- print: "**** done restarted mon.b 06-monb-upgrade-jewel/monb.yaml" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/07-workload/+ b/suites/upgrade/hammer-jewel-x/stress-split/07-workload/+ deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/suites/upgrade/hammer-jewel-x/stress-split/07-workload/radosbench.yaml b/suites/upgrade/hammer-jewel-x/stress-split/07-workload/radosbench.yaml deleted file mode 100644 index 7f10f7a69b26..000000000000 --- a/suites/upgrade/hammer-jewel-x/stress-split/07-workload/radosbench.yaml +++ /dev/null @@ -1,33 +0,0 @@ -tasks: -- full_sequential: - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 -- print: "**** done 07-workload/radosbench.yaml" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/07-workload/rbd_api.yaml b/suites/upgrade/hammer-jewel-x/stress-split/07-workload/rbd_api.yaml deleted file mode 100644 index 0029eec85f39..000000000000 --- a/suites/upgrade/hammer-jewel-x/stress-split/07-workload/rbd_api.yaml +++ /dev/null @@ -1,6 +0,0 @@ -#tasks: -#- workunit: -# clients: -# client.0: -# - rbd/test_librbd.sh -#- print: "**** done 07-workload/rbd_api.yaml" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/08-monc-upgrade-jewel/monc.yaml b/suites/upgrade/hammer-jewel-x/stress-split/08-monc-upgrade-jewel/monc.yaml deleted file mode 100644 index 15a71050110d..000000000000 --- a/suites/upgrade/hammer-jewel-x/stress-split/08-monc-upgrade-jewel/monc.yaml +++ /dev/null @@ -1,8 +0,0 @@ -tasks: -- ceph.restart: - daemons: [mon.c] - wait-for-healthy: false - wait-for-osds-up: true -- print: "**** done ceph.restart mon.c" -- ceph.wait_for_mon_quorum: [a, b, c] -- print: "**** done 08-monc-upgrade-jewel/monc.yaml" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/09-workload/rbd-python.yaml b/suites/upgrade/hammer-jewel-x/stress-split/09-workload/rbd-python.yaml deleted file mode 100644 index 932035642cf5..000000000000 --- a/suites/upgrade/hammer-jewel-x/stress-split/09-workload/rbd-python.yaml +++ /dev/null @@ -1,7 +0,0 @@ -#tasks: -#- workunit: -# branch: hammer -# clients: -# client.0: -# - rbd/test_librbd_python.sh -#- print: "**** done 09-workload/rbd-python.yaml" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/1-hammer-install-and-upgrade-to-jewel/hammer-to-jewel.yaml b/suites/upgrade/hammer-jewel-x/stress-split/1-hammer-install-and-upgrade-to-jewel/hammer-to-jewel.yaml new file mode 100644 index 000000000000..0ed59c5e0405 --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/stress-split/1-hammer-install-and-upgrade-to-jewel/hammer-to-jewel.yaml @@ -0,0 +1,89 @@ +tasks: +- install: + branch: hammer + exclude_packages: + - ceph-mgr + - libcephfs2 + - libcephfs-devel + - libcephfs-dev +- print: '**** done hammer' +- ceph: + fs: xfs +- install.upgrade: + exclude_packages: + - ceph-mgr + - libcephfs2 + - libcephfs-devel + - libcephfs-dev + osd.0: + branch: jewel + osd.3: + branch: jewel +- print: '*** client.0 upgraded packages to jewel' +- parallel: + - workload-h-j + - upgrade-sequence-h-j +- print: '**** done parallel' +- install.upgrade: + client.0: + branch: jewel + exclude_packages: + - ceph-mgr + - libcephfs2 + - libcephfs-devel + - libcephfs-dev +- exec: + osd.0: + - ceph osd set sortbitwise + - ceph osd set require_jewel_osds + - for p in `ceph osd pool ls` ; do ceph osd pool set $p use_gmt_hitset true ; + done +- install.upgrade: + client.0: + branch: jewel + exclude_packages: + - ceph-mgr + - libcephfs2 + - libcephfs-devel + - libcephfs-dev +- print: '**** done install.upgrade client.0 to jewel' +upgrade-sequence-h-j: + sequential: + - ceph.restart: + daemons: + - osd.0 + - osd.1 + - osd.2 + - osd.3 + - osd.4 + - osd.5 + wait-for-healthy: false + wait-for-osds-up: true + - ceph.restart: + daemons: + - mon.a + - mon.b + - mon.c + wait-for-healthy: false + wait-for-osds-up: true + - print: '**** done ceph.restart do not wait for healthy' + - exec: + mon.a: + - sleep 300 + - ceph osd set require_jewel_osds + - ceph.healthy: null + - print: '**** done ceph.healthy' +workload-h-j: + full_sequential: + - workunit: + branch: hammer + clients: + client.0: + - cls + - print: "**** done cls 2-workload" + - workunit: + branch: hammer + clients: + client.0: + - rbd/test_librbd.sh + - print: "**** done rbd/test_librbd.sh 2-workload" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/10-osds-upgrade-jewel/secondhalf.yaml b/suites/upgrade/hammer-jewel-x/stress-split/10-osds-upgrade-jewel/secondhalf.yaml deleted file mode 100644 index 9ee024e9f422..000000000000 --- a/suites/upgrade/hammer-jewel-x/stress-split/10-osds-upgrade-jewel/secondhalf.yaml +++ /dev/null @@ -1,8 +0,0 @@ -tasks: -- install.upgrade: - osd.3: - branch: jewel -- print: "**** done install.upgrade jewel" -- ceph.restart: - daemons: [osd.3, osd.4, osd.5] -- print: "**** done 10-osds-upgrade-jewel/secondhalf.yaml" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/11-workload/snaps-few-objects.yaml b/suites/upgrade/hammer-jewel-x/stress-split/11-workload/snaps-few-objects.yaml deleted file mode 100644 index b9f02711540f..000000000000 --- a/suites/upgrade/hammer-jewel-x/stress-split/11-workload/snaps-few-objects.yaml +++ /dev/null @@ -1,14 +0,0 @@ -tasks: -- rados: - clients: [client.0] - ops: 4000 - objects: 50 - write_append_excl: false - op_weights: - read: 100 - write: 100 - delete: 50 - snap_create: 50 - snap_remove: 50 - rollback: 50 -- print: "**** done 11-workload/snaps-few-objects.yaml" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/12-partial-upgrade-x/first.yaml b/suites/upgrade/hammer-jewel-x/stress-split/12-partial-upgrade-x/first.yaml deleted file mode 100644 index 9f52417cf273..000000000000 --- a/suites/upgrade/hammer-jewel-x/stress-split/12-partial-upgrade-x/first.yaml +++ /dev/null @@ -1,7 +0,0 @@ -tasks: -- install.upgrade: - osd.0: -- print: "**** done install.upgrade -x osd.0" -- ceph.restart: - daemons: [osd.0, osd.1, osd.2] -- print: "**** done 12-partial-upgrade-x/first.yaml" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/13-workload/rados_loadgen_big.yaml b/suites/upgrade/hammer-jewel-x/stress-split/13-workload/rados_loadgen_big.yaml deleted file mode 100644 index 90698cb30e3d..000000000000 --- a/suites/upgrade/hammer-jewel-x/stress-split/13-workload/rados_loadgen_big.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- workunit: - clients: - client.0: - - rados/load-gen-big.sh -- print: "**** done 13-workload/rados_loadgen_big.yaml" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/14-mona-upgrade-x/mona.yaml b/suites/upgrade/hammer-jewel-x/stress-split/14-mona-upgrade-x/mona.yaml deleted file mode 100644 index d83162c8b736..000000000000 --- a/suites/upgrade/hammer-jewel-x/stress-split/14-mona-upgrade-x/mona.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- ceph.restart: - daemons: [mon.a] - wait-for-healthy: false - wait-for-osds-up: true -- print: "**** done ceph.restart mon.a 14-mona-upgrade-x/mona.yaml" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/15-workload/rbd-import-export.yaml b/suites/upgrade/hammer-jewel-x/stress-split/15-workload/rbd-import-export.yaml deleted file mode 100644 index 7e6d43bff070..000000000000 --- a/suites/upgrade/hammer-jewel-x/stress-split/15-workload/rbd-import-export.yaml +++ /dev/null @@ -1,8 +0,0 @@ -tasks: -- workunit: - clients: - client.0: - - rbd/import_export.sh - env: - RBD_CREATE_ARGS: --new-format -- print: "**** done 15-workload/rbd-import-export.yaml" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/16-monb-upgrade-x/monb.yaml b/suites/upgrade/hammer-jewel-x/stress-split/16-monb-upgrade-x/monb.yaml deleted file mode 100644 index 91234034eb3e..000000000000 --- a/suites/upgrade/hammer-jewel-x/stress-split/16-monb-upgrade-x/monb.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- ceph.restart: - daemons: [mon.b] - wait-for-healthy: false - wait-for-osds-up: true -- print: "**** done ceph.restart mon.b 16-monb-upgrade-x/monb.yaml" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/17-workload/readwrite.yaml b/suites/upgrade/hammer-jewel-x/stress-split/17-workload/readwrite.yaml deleted file mode 100644 index ee49512c42c6..000000000000 --- a/suites/upgrade/hammer-jewel-x/stress-split/17-workload/readwrite.yaml +++ /dev/null @@ -1,11 +0,0 @@ -tasks: -- rados: - clients: [client.0] - ops: 4000 - objects: 500 - write_append_excl: false - op_weights: - read: 45 - write: 45 - delete: 10 -- print: "**** done 17-workload/readwrite.yaml" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/18-monc-upgrade-x/monc.yaml b/suites/upgrade/hammer-jewel-x/stress-split/18-monc-upgrade-x/monc.yaml deleted file mode 100644 index f708237d63e1..000000000000 --- a/suites/upgrade/hammer-jewel-x/stress-split/18-monc-upgrade-x/monc.yaml +++ /dev/null @@ -1,8 +0,0 @@ -tasks: -- ceph.restart: - daemons: [mon.c] - wait-for-healthy: false - wait-for-osds-up: true -- print: "**** done ceph.restart mon.c" -- ceph.wait_for_mon_quorum: [a, b, c] -- print: "**** done 18-monc-upgrade-x/monc.yaml" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/19-workload/radosbench.yaml b/suites/upgrade/hammer-jewel-x/stress-split/19-workload/radosbench.yaml deleted file mode 100644 index d51088d8356a..000000000000 --- a/suites/upgrade/hammer-jewel-x/stress-split/19-workload/radosbench.yaml +++ /dev/null @@ -1,33 +0,0 @@ -tasks: -- full_sequential: - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 -- print: "**** done 19-workload/radosbench.yaml" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/2-partial-upgrade b/suites/upgrade/hammer-jewel-x/stress-split/2-partial-upgrade new file mode 120000 index 000000000000..fad7148528de --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/stress-split/2-partial-upgrade @@ -0,0 +1 @@ +../../jewel-x/stress-split/2-partial-upgrade/ \ No newline at end of file diff --git a/suites/upgrade/hammer-jewel-x/stress-split/20-osds-upgrade-x/osds_secondhalf.yaml b/suites/upgrade/hammer-jewel-x/stress-split/20-osds-upgrade-x/osds_secondhalf.yaml deleted file mode 100644 index 38f011da88a2..000000000000 --- a/suites/upgrade/hammer-jewel-x/stress-split/20-osds-upgrade-x/osds_secondhalf.yaml +++ /dev/null @@ -1,11 +0,0 @@ -tasks: -- install.upgrade: - osd.3: -- print: "**** done install.upgrade osd.3" -- ceph.restart: - daemons: [osd.3, osd.4, osd.5] -- print: "**** done 20-osds-upgrade-x/osds_secondhalf.yaml" -- exec: - mon.b: - - ceph osd set require_jewel_osds -- print: "**** done exec 'ceph osd set require_jewel_osds'" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/21-final-workload/+ b/suites/upgrade/hammer-jewel-x/stress-split/21-final-workload/+ deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/suites/upgrade/hammer-jewel-x/stress-split/21-final-workload/rados_stress_watch.yaml b/suites/upgrade/hammer-jewel-x/stress-split/21-final-workload/rados_stress_watch.yaml deleted file mode 100644 index a164beab5139..000000000000 --- a/suites/upgrade/hammer-jewel-x/stress-split/21-final-workload/rados_stress_watch.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- workunit: - clients: - client.0: - - rados/stress_watch.sh -- print: "**** done 21-final-workload/rados_stress_watch.yaml" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/21-final-workload/rbd_cls_tests.yaml b/suites/upgrade/hammer-jewel-x/stress-split/21-final-workload/rbd_cls_tests.yaml deleted file mode 100644 index 872cf625cde9..000000000000 --- a/suites/upgrade/hammer-jewel-x/stress-split/21-final-workload/rbd_cls_tests.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- workunit: - clients: - client.0: - - cls/test_cls_rbd.sh -- print: "**** done 21-final-workload/rbd_cls_tests.yaml" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/21-final-workload/rgw-swift.yaml b/suites/upgrade/hammer-jewel-x/stress-split/21-final-workload/rgw-swift.yaml deleted file mode 100644 index 00a1fac0ce0d..000000000000 --- a/suites/upgrade/hammer-jewel-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 -- print: "**** done 21-final-workload/rgw-swift.yaml" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/3-thrash b/suites/upgrade/hammer-jewel-x/stress-split/3-thrash new file mode 120000 index 000000000000..894fdeb92f2a --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/stress-split/3-thrash @@ -0,0 +1 @@ +../../jewel-x/stress-split/3-thrash/ \ No newline at end of file diff --git a/suites/upgrade/hammer-jewel-x/stress-split/4-mon b/suites/upgrade/hammer-jewel-x/stress-split/4-mon new file mode 120000 index 000000000000..da3b2aac7027 --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/stress-split/4-mon @@ -0,0 +1 @@ +../../jewel-x/stress-split/4-mon/ \ No newline at end of file diff --git a/suites/upgrade/hammer-jewel-x/stress-split/5-workload b/suites/upgrade/hammer-jewel-x/stress-split/5-workload new file mode 120000 index 000000000000..6ebbbb48ae93 --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/stress-split/5-workload @@ -0,0 +1 @@ +../../jewel-x/stress-split/5-workload/ \ No newline at end of file diff --git a/suites/upgrade/hammer-jewel-x/stress-split/6-next-mon b/suites/upgrade/hammer-jewel-x/stress-split/6-next-mon new file mode 120000 index 000000000000..1a19a3ac7163 --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/stress-split/6-next-mon @@ -0,0 +1 @@ +../../jewel-x/stress-split/6-next-mon/ \ No newline at end of file diff --git a/suites/upgrade/hammer-jewel-x/stress-split/7-workload b/suites/upgrade/hammer-jewel-x/stress-split/7-workload new file mode 120000 index 000000000000..06ebb5fa68d3 --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/stress-split/7-workload @@ -0,0 +1 @@ +../../jewel-x/stress-split/7-workload/ \ No newline at end of file diff --git a/suites/upgrade/hammer-jewel-x/stress-split/8-next-mon b/suites/upgrade/hammer-jewel-x/stress-split/8-next-mon new file mode 120000 index 000000000000..fa5113db15c8 --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/stress-split/8-next-mon @@ -0,0 +1 @@ +../../jewel-x/stress-split/8-next-mon/ \ No newline at end of file diff --git a/suites/upgrade/hammer-jewel-x/stress-split/9-workload b/suites/upgrade/hammer-jewel-x/stress-split/9-workload new file mode 120000 index 000000000000..eb67cf79823f --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/stress-split/9-workload @@ -0,0 +1 @@ +../../jewel-x/stress-split/9-workload/ \ No newline at end of file diff --git a/suites/upgrade/jewel-x/stress-split/0-cluster/start.yaml b/suites/upgrade/jewel-x/stress-split/0-cluster/start.yaml index fd200d752a26..40536ab40471 100644 --- a/suites/upgrade/jewel-x/stress-split/0-cluster/start.yaml +++ b/suites/upgrade/jewel-x/stress-split/0-cluster/start.yaml @@ -13,7 +13,6 @@ roles: - - mon.a - mon.b - mon.c - - mds.a - osd.0 - osd.1 - osd.2 -- 2.47.3