From 55c219e9ed76e1d6b4425163ee94900a48cf22f0 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Wed, 26 Aug 2020 07:46:27 -0700 Subject: [PATCH] qa/suites/smoke: remove packages on test completion A new teuthology PR [1] skips package cleanup by default. Use the lightweight smoke suite to ensure that package cleanup continues to work. [1] https://github.com/ceph/teuthology/pull/1553 Signed-off-by: Patrick Donnelly --- qa/suites/smoke/basic/tasks/% | 0 qa/suites/smoke/basic/tasks/0-install.yaml | 3 +++ .../tasks/{ => test}/cfuse_workunit_suites_blogbench.yaml | 1 - .../basic/tasks/{ => test}/cfuse_workunit_suites_fsstress.yaml | 1 - .../basic/tasks/{ => test}/cfuse_workunit_suites_iozone.yaml | 1 - .../basic/tasks/{ => test}/cfuse_workunit_suites_pjd.yaml | 1 - .../basic/tasks/{ => test}/kclient_workunit_direct_io.yaml | 1 - .../basic/tasks/{ => test}/kclient_workunit_suites_dbench.yaml | 1 - .../tasks/{ => test}/kclient_workunit_suites_fsstress.yaml | 1 - .../basic/tasks/{ => test}/kclient_workunit_suites_pjd.yaml | 1 - .../basic/tasks/{ => test}/libcephfs_interface_tests.yaml | 1 - qa/suites/smoke/basic/tasks/{ => test}/mon_thrash.yaml | 1 - qa/suites/smoke/basic/tasks/{ => test}/rados_api_tests.yaml | 1 - qa/suites/smoke/basic/tasks/{ => test}/rados_bench.yaml | 1 - qa/suites/smoke/basic/tasks/{ => test}/rados_cache_snaps.yaml | 1 - qa/suites/smoke/basic/tasks/{ => test}/rados_cls_all.yaml | 1 - qa/suites/smoke/basic/tasks/{ => test}/rados_ec_snaps.yaml | 1 - qa/suites/smoke/basic/tasks/{ => test}/rados_python.yaml | 1 - .../basic/tasks/{ => test}/rados_workunit_loadgen_mix.yaml | 1 - qa/suites/smoke/basic/tasks/{ => test}/rbd_api_tests.yaml | 1 - .../smoke/basic/tasks/{ => test}/rbd_cli_import_export.yaml | 1 - qa/suites/smoke/basic/tasks/{ => test}/rbd_fsx.yaml | 1 - .../smoke/basic/tasks/{ => test}/rbd_python_api_tests.yaml | 1 - .../basic/tasks/{ => test}/rbd_workunit_suites_iozone.yaml | 1 - qa/suites/smoke/basic/tasks/{ => test}/rgw_ec_s3tests.yaml | 1 - qa/suites/smoke/basic/tasks/{ => test}/rgw_s3tests.yaml | 1 - 26 files changed, 3 insertions(+), 24 deletions(-) create mode 100644 qa/suites/smoke/basic/tasks/% create mode 100644 qa/suites/smoke/basic/tasks/0-install.yaml rename qa/suites/smoke/basic/tasks/{ => test}/cfuse_workunit_suites_blogbench.yaml (90%) rename qa/suites/smoke/basic/tasks/{ => test}/cfuse_workunit_suites_fsstress.yaml (89%) rename qa/suites/smoke/basic/tasks/{ => test}/cfuse_workunit_suites_iozone.yaml (90%) rename qa/suites/smoke/basic/tasks/{ => test}/cfuse_workunit_suites_pjd.yaml (96%) rename qa/suites/smoke/basic/tasks/{ => test}/kclient_workunit_direct_io.yaml (93%) rename qa/suites/smoke/basic/tasks/{ => test}/kclient_workunit_suites_dbench.yaml (94%) rename qa/suites/smoke/basic/tasks/{ => test}/kclient_workunit_suites_fsstress.yaml (94%) rename qa/suites/smoke/basic/tasks/{ => test}/kclient_workunit_suites_pjd.yaml (94%) rename qa/suites/smoke/basic/tasks/{ => test}/libcephfs_interface_tests.yaml (95%) rename qa/suites/smoke/basic/tasks/{ => test}/mon_thrash.yaml (97%) rename qa/suites/smoke/basic/tasks/{ => test}/rados_api_tests.yaml (97%) rename qa/suites/smoke/basic/tasks/{ => test}/rados_bench.yaml (98%) rename qa/suites/smoke/basic/tasks/{ => test}/rados_cache_snaps.yaml (98%) rename qa/suites/smoke/basic/tasks/{ => test}/rados_cls_all.yaml (94%) rename qa/suites/smoke/basic/tasks/{ => test}/rados_ec_snaps.yaml (97%) rename qa/suites/smoke/basic/tasks/{ => test}/rados_python.yaml (96%) rename qa/suites/smoke/basic/tasks/{ => test}/rados_workunit_loadgen_mix.yaml (95%) rename qa/suites/smoke/basic/tasks/{ => test}/rbd_api_tests.yaml (96%) rename qa/suites/smoke/basic/tasks/{ => test}/rbd_cli_import_export.yaml (93%) rename qa/suites/smoke/basic/tasks/{ => test}/rbd_fsx.yaml (97%) rename qa/suites/smoke/basic/tasks/{ => test}/rbd_python_api_tests.yaml (92%) rename qa/suites/smoke/basic/tasks/{ => test}/rbd_workunit_suites_iozone.yaml (95%) rename qa/suites/smoke/basic/tasks/{ => test}/rgw_ec_s3tests.yaml (97%) rename qa/suites/smoke/basic/tasks/{ => test}/rgw_s3tests.yaml (97%) diff --git a/qa/suites/smoke/basic/tasks/% b/qa/suites/smoke/basic/tasks/% new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/qa/suites/smoke/basic/tasks/0-install.yaml b/qa/suites/smoke/basic/tasks/0-install.yaml new file mode 100644 index 0000000000000..ceffc50d87c86 --- /dev/null +++ b/qa/suites/smoke/basic/tasks/0-install.yaml @@ -0,0 +1,3 @@ +tasks: +- install: + cleanup: true diff --git a/qa/suites/smoke/basic/tasks/cfuse_workunit_suites_blogbench.yaml b/qa/suites/smoke/basic/tasks/test/cfuse_workunit_suites_blogbench.yaml similarity index 90% rename from qa/suites/smoke/basic/tasks/cfuse_workunit_suites_blogbench.yaml rename to qa/suites/smoke/basic/tasks/test/cfuse_workunit_suites_blogbench.yaml index 2ee417723b0b4..0e51ed0e4fd0f 100644 --- a/qa/suites/smoke/basic/tasks/cfuse_workunit_suites_blogbench.yaml +++ b/qa/suites/smoke/basic/tasks/test/cfuse_workunit_suites_blogbench.yaml @@ -1,5 +1,4 @@ tasks: -- install: - ceph: fs: xfs - ceph-fuse: diff --git a/qa/suites/smoke/basic/tasks/cfuse_workunit_suites_fsstress.yaml b/qa/suites/smoke/basic/tasks/test/cfuse_workunit_suites_fsstress.yaml similarity index 89% rename from qa/suites/smoke/basic/tasks/cfuse_workunit_suites_fsstress.yaml rename to qa/suites/smoke/basic/tasks/test/cfuse_workunit_suites_fsstress.yaml index b58487c078532..8f0bc592c903a 100644 --- a/qa/suites/smoke/basic/tasks/cfuse_workunit_suites_fsstress.yaml +++ b/qa/suites/smoke/basic/tasks/test/cfuse_workunit_suites_fsstress.yaml @@ -1,5 +1,4 @@ tasks: -- install: - ceph: - ceph-fuse: - workunit: diff --git a/qa/suites/smoke/basic/tasks/cfuse_workunit_suites_iozone.yaml b/qa/suites/smoke/basic/tasks/test/cfuse_workunit_suites_iozone.yaml similarity index 90% rename from qa/suites/smoke/basic/tasks/cfuse_workunit_suites_iozone.yaml rename to qa/suites/smoke/basic/tasks/test/cfuse_workunit_suites_iozone.yaml index dc6df2f709fbc..fedc23081b4d0 100644 --- a/qa/suites/smoke/basic/tasks/cfuse_workunit_suites_iozone.yaml +++ b/qa/suites/smoke/basic/tasks/test/cfuse_workunit_suites_iozone.yaml @@ -1,5 +1,4 @@ tasks: -- install: - ceph: - ceph-fuse: [client.0] - workunit: diff --git a/qa/suites/smoke/basic/tasks/cfuse_workunit_suites_pjd.yaml b/qa/suites/smoke/basic/tasks/test/cfuse_workunit_suites_pjd.yaml similarity index 96% rename from qa/suites/smoke/basic/tasks/cfuse_workunit_suites_pjd.yaml rename to qa/suites/smoke/basic/tasks/test/cfuse_workunit_suites_pjd.yaml index a76154d1d909b..753cd71f78d3a 100644 --- a/qa/suites/smoke/basic/tasks/cfuse_workunit_suites_pjd.yaml +++ b/qa/suites/smoke/basic/tasks/test/cfuse_workunit_suites_pjd.yaml @@ -1,5 +1,4 @@ tasks: -- install: - ceph: fs: xfs conf: diff --git a/qa/suites/smoke/basic/tasks/kclient_workunit_direct_io.yaml b/qa/suites/smoke/basic/tasks/test/kclient_workunit_direct_io.yaml similarity index 93% rename from qa/suites/smoke/basic/tasks/kclient_workunit_direct_io.yaml rename to qa/suites/smoke/basic/tasks/test/kclient_workunit_direct_io.yaml index 21820071dbc28..6d3ccdf055673 100644 --- a/qa/suites/smoke/basic/tasks/kclient_workunit_direct_io.yaml +++ b/qa/suites/smoke/basic/tasks/test/kclient_workunit_direct_io.yaml @@ -4,7 +4,6 @@ overrides: global: ms die on skipped message: false tasks: -- install: - ceph: - kclient: - workunit: diff --git a/qa/suites/smoke/basic/tasks/kclient_workunit_suites_dbench.yaml b/qa/suites/smoke/basic/tasks/test/kclient_workunit_suites_dbench.yaml similarity index 94% rename from qa/suites/smoke/basic/tasks/kclient_workunit_suites_dbench.yaml rename to qa/suites/smoke/basic/tasks/test/kclient_workunit_suites_dbench.yaml index 01d7470a50e8c..2a9b991a97208 100644 --- a/qa/suites/smoke/basic/tasks/kclient_workunit_suites_dbench.yaml +++ b/qa/suites/smoke/basic/tasks/test/kclient_workunit_suites_dbench.yaml @@ -4,7 +4,6 @@ overrides: global: ms die on skipped message: false tasks: -- install: - ceph: fs: xfs - kclient: diff --git a/qa/suites/smoke/basic/tasks/kclient_workunit_suites_fsstress.yaml b/qa/suites/smoke/basic/tasks/test/kclient_workunit_suites_fsstress.yaml similarity index 94% rename from qa/suites/smoke/basic/tasks/kclient_workunit_suites_fsstress.yaml rename to qa/suites/smoke/basic/tasks/test/kclient_workunit_suites_fsstress.yaml index 42d6b97c5b5c5..96a7a215db76b 100644 --- a/qa/suites/smoke/basic/tasks/kclient_workunit_suites_fsstress.yaml +++ b/qa/suites/smoke/basic/tasks/test/kclient_workunit_suites_fsstress.yaml @@ -4,7 +4,6 @@ overrides: global: ms die on skipped message: false tasks: -- install: - ceph: fs: xfs - kclient: diff --git a/qa/suites/smoke/basic/tasks/kclient_workunit_suites_pjd.yaml b/qa/suites/smoke/basic/tasks/test/kclient_workunit_suites_pjd.yaml similarity index 94% rename from qa/suites/smoke/basic/tasks/kclient_workunit_suites_pjd.yaml rename to qa/suites/smoke/basic/tasks/test/kclient_workunit_suites_pjd.yaml index 6818a2a683347..60723a4164f45 100644 --- a/qa/suites/smoke/basic/tasks/kclient_workunit_suites_pjd.yaml +++ b/qa/suites/smoke/basic/tasks/test/kclient_workunit_suites_pjd.yaml @@ -4,7 +4,6 @@ overrides: global: ms die on skipped message: false tasks: -- install: - ceph: fs: xfs - kclient: diff --git a/qa/suites/smoke/basic/tasks/libcephfs_interface_tests.yaml b/qa/suites/smoke/basic/tasks/test/libcephfs_interface_tests.yaml similarity index 95% rename from qa/suites/smoke/basic/tasks/libcephfs_interface_tests.yaml rename to qa/suites/smoke/basic/tasks/test/libcephfs_interface_tests.yaml index aa2e7679a7724..2e332f0137d45 100644 --- a/qa/suites/smoke/basic/tasks/libcephfs_interface_tests.yaml +++ b/qa/suites/smoke/basic/tasks/test/libcephfs_interface_tests.yaml @@ -8,7 +8,6 @@ overrides: debug ms: 1 debug mds: 20 tasks: -- install: - ceph: - ceph-fuse: - workunit: diff --git a/qa/suites/smoke/basic/tasks/mon_thrash.yaml b/qa/suites/smoke/basic/tasks/test/mon_thrash.yaml similarity index 97% rename from qa/suites/smoke/basic/tasks/mon_thrash.yaml rename to qa/suites/smoke/basic/tasks/test/mon_thrash.yaml index 6bc0957a07e30..ba150c32d8cb2 100644 --- a/qa/suites/smoke/basic/tasks/mon_thrash.yaml +++ b/qa/suites/smoke/basic/tasks/test/mon_thrash.yaml @@ -24,7 +24,6 @@ overrides: ms inject socket failures: 2500 mon client directed command retry: 5 tasks: -- install: null - ceph: fs: xfs - mon_thrash: diff --git a/qa/suites/smoke/basic/tasks/rados_api_tests.yaml b/qa/suites/smoke/basic/tasks/test/rados_api_tests.yaml similarity index 97% rename from qa/suites/smoke/basic/tasks/rados_api_tests.yaml rename to qa/suites/smoke/basic/tasks/test/rados_api_tests.yaml index aec932999edc0..184812d012b92 100644 --- a/qa/suites/smoke/basic/tasks/rados_api_tests.yaml +++ b/qa/suites/smoke/basic/tasks/test/rados_api_tests.yaml @@ -1,5 +1,4 @@ tasks: -- install: null - ceph: fs: ext4 log-ignorelist: diff --git a/qa/suites/smoke/basic/tasks/rados_bench.yaml b/qa/suites/smoke/basic/tasks/test/rados_bench.yaml similarity index 98% rename from qa/suites/smoke/basic/tasks/rados_bench.yaml rename to qa/suites/smoke/basic/tasks/test/rados_bench.yaml index 1268e3652cac9..ae8862e1c51a1 100644 --- a/qa/suites/smoke/basic/tasks/rados_bench.yaml +++ b/qa/suites/smoke/basic/tasks/test/rados_bench.yaml @@ -9,7 +9,6 @@ overrides: ms inject socket failures: 2500 mon client directed command retry: 5 tasks: -- install: null - ceph: fs: xfs log-ignorelist: diff --git a/qa/suites/smoke/basic/tasks/rados_cache_snaps.yaml b/qa/suites/smoke/basic/tasks/test/rados_cache_snaps.yaml similarity index 98% rename from qa/suites/smoke/basic/tasks/rados_cache_snaps.yaml rename to qa/suites/smoke/basic/tasks/test/rados_cache_snaps.yaml index e433a4e05ee0a..7178f68245bf4 100644 --- a/qa/suites/smoke/basic/tasks/rados_cache_snaps.yaml +++ b/qa/suites/smoke/basic/tasks/test/rados_cache_snaps.yaml @@ -1,5 +1,4 @@ tasks: -- install: null - ceph: log-ignorelist: - overall HEALTH_ diff --git a/qa/suites/smoke/basic/tasks/rados_cls_all.yaml b/qa/suites/smoke/basic/tasks/test/rados_cls_all.yaml similarity index 94% rename from qa/suites/smoke/basic/tasks/rados_cls_all.yaml rename to qa/suites/smoke/basic/tasks/test/rados_cls_all.yaml index 0c467d0054372..07e28a7a46d93 100644 --- a/qa/suites/smoke/basic/tasks/rados_cls_all.yaml +++ b/qa/suites/smoke/basic/tasks/test/rados_cls_all.yaml @@ -5,7 +5,6 @@ overrides: osd_class_load_list: "*" osd_class_default_list: "*" tasks: -- install: - ceph: fs: xfs - workunit: diff --git a/qa/suites/smoke/basic/tasks/rados_ec_snaps.yaml b/qa/suites/smoke/basic/tasks/test/rados_ec_snaps.yaml similarity index 97% rename from qa/suites/smoke/basic/tasks/rados_ec_snaps.yaml rename to qa/suites/smoke/basic/tasks/test/rados_ec_snaps.yaml index c60d110c0a48f..5ee4a7ad90e2b 100644 --- a/qa/suites/smoke/basic/tasks/rados_ec_snaps.yaml +++ b/qa/suites/smoke/basic/tasks/test/rados_ec_snaps.yaml @@ -1,5 +1,4 @@ tasks: -- install: null - ceph: fs: xfs log-ignorelist: diff --git a/qa/suites/smoke/basic/tasks/rados_python.yaml b/qa/suites/smoke/basic/tasks/test/rados_python.yaml similarity index 96% rename from qa/suites/smoke/basic/tasks/rados_python.yaml rename to qa/suites/smoke/basic/tasks/test/rados_python.yaml index 7df4616bb809e..61ea66a4bd52c 100644 --- a/qa/suites/smoke/basic/tasks/rados_python.yaml +++ b/qa/suites/smoke/basic/tasks/test/rados_python.yaml @@ -1,5 +1,4 @@ tasks: -- install: - ceph: log-ignorelist: - but it is still running diff --git a/qa/suites/smoke/basic/tasks/rados_workunit_loadgen_mix.yaml b/qa/suites/smoke/basic/tasks/test/rados_workunit_loadgen_mix.yaml similarity index 95% rename from qa/suites/smoke/basic/tasks/rados_workunit_loadgen_mix.yaml rename to qa/suites/smoke/basic/tasks/test/rados_workunit_loadgen_mix.yaml index cda4df2a3fead..455d6ae873033 100644 --- a/qa/suites/smoke/basic/tasks/rados_workunit_loadgen_mix.yaml +++ b/qa/suites/smoke/basic/tasks/test/rados_workunit_loadgen_mix.yaml @@ -1,5 +1,4 @@ tasks: -- install: - ceph: fs: ext4 log-ignorelist: diff --git a/qa/suites/smoke/basic/tasks/rbd_api_tests.yaml b/qa/suites/smoke/basic/tasks/test/rbd_api_tests.yaml similarity index 96% rename from qa/suites/smoke/basic/tasks/rbd_api_tests.yaml rename to qa/suites/smoke/basic/tasks/test/rbd_api_tests.yaml index b3aed5c842916..3e13adb0089e5 100644 --- a/qa/suites/smoke/basic/tasks/rbd_api_tests.yaml +++ b/qa/suites/smoke/basic/tasks/test/rbd_api_tests.yaml @@ -1,5 +1,4 @@ tasks: -- install: - ceph: log-ignorelist: - overall HEALTH_ diff --git a/qa/suites/smoke/basic/tasks/rbd_cli_import_export.yaml b/qa/suites/smoke/basic/tasks/test/rbd_cli_import_export.yaml similarity index 93% rename from qa/suites/smoke/basic/tasks/rbd_cli_import_export.yaml rename to qa/suites/smoke/basic/tasks/test/rbd_cli_import_export.yaml index e9f38d3a9ffaa..9c2ad68a311e0 100644 --- a/qa/suites/smoke/basic/tasks/rbd_cli_import_export.yaml +++ b/qa/suites/smoke/basic/tasks/test/rbd_cli_import_export.yaml @@ -1,5 +1,4 @@ tasks: -- install: - ceph: fs: xfs - ceph-fuse: diff --git a/qa/suites/smoke/basic/tasks/rbd_fsx.yaml b/qa/suites/smoke/basic/tasks/test/rbd_fsx.yaml similarity index 97% rename from qa/suites/smoke/basic/tasks/rbd_fsx.yaml rename to qa/suites/smoke/basic/tasks/test/rbd_fsx.yaml index a84d184d47cc6..92bdea28048ba 100644 --- a/qa/suites/smoke/basic/tasks/rbd_fsx.yaml +++ b/qa/suites/smoke/basic/tasks/test/rbd_fsx.yaml @@ -20,7 +20,6 @@ overrides: ms inject socket failures: 5000 mon client directed command retry: 5 tasks: -- install: null - ceph: fs: xfs - thrashosds: diff --git a/qa/suites/smoke/basic/tasks/rbd_python_api_tests.yaml b/qa/suites/smoke/basic/tasks/test/rbd_python_api_tests.yaml similarity index 92% rename from qa/suites/smoke/basic/tasks/rbd_python_api_tests.yaml rename to qa/suites/smoke/basic/tasks/test/rbd_python_api_tests.yaml index 9714a6e40ee37..233663723932b 100644 --- a/qa/suites/smoke/basic/tasks/rbd_python_api_tests.yaml +++ b/qa/suites/smoke/basic/tasks/test/rbd_python_api_tests.yaml @@ -1,5 +1,4 @@ tasks: -- install: - ceph: - ceph-fuse: - workunit: diff --git a/qa/suites/smoke/basic/tasks/rbd_workunit_suites_iozone.yaml b/qa/suites/smoke/basic/tasks/test/rbd_workunit_suites_iozone.yaml similarity index 95% rename from qa/suites/smoke/basic/tasks/rbd_workunit_suites_iozone.yaml rename to qa/suites/smoke/basic/tasks/test/rbd_workunit_suites_iozone.yaml index 237aa4b319b3c..1cbaebc89c5be 100644 --- a/qa/suites/smoke/basic/tasks/rbd_workunit_suites_iozone.yaml +++ b/qa/suites/smoke/basic/tasks/test/rbd_workunit_suites_iozone.yaml @@ -6,7 +6,6 @@ overrides: client: rbd default features: 5 tasks: -- install: - ceph: - rbd: all: diff --git a/qa/suites/smoke/basic/tasks/rgw_ec_s3tests.yaml b/qa/suites/smoke/basic/tasks/test/rgw_ec_s3tests.yaml similarity index 97% rename from qa/suites/smoke/basic/tasks/rgw_ec_s3tests.yaml rename to qa/suites/smoke/basic/tasks/test/rgw_ec_s3tests.yaml index 29a6cec129c0c..8d1c9fc72a312 100644 --- a/qa/suites/smoke/basic/tasks/rgw_ec_s3tests.yaml +++ b/qa/suites/smoke/basic/tasks/test/rgw_ec_s3tests.yaml @@ -4,7 +4,6 @@ overrides: cache-pools: true frontend: civetweb tasks: -- install: - ceph: - rgw: [client.0] - s3tests: diff --git a/qa/suites/smoke/basic/tasks/rgw_s3tests.yaml b/qa/suites/smoke/basic/tasks/test/rgw_s3tests.yaml similarity index 97% rename from qa/suites/smoke/basic/tasks/rgw_s3tests.yaml rename to qa/suites/smoke/basic/tasks/test/rgw_s3tests.yaml index 2ba6a4b497e04..189a2d57363b3 100644 --- a/qa/suites/smoke/basic/tasks/rgw_s3tests.yaml +++ b/qa/suites/smoke/basic/tasks/test/rgw_s3tests.yaml @@ -1,5 +1,4 @@ tasks: -- install: - ceph: fs: xfs - rgw: [client.0] -- 2.47.3