From 5f5f3709259e33cb1fbc16fc8d1f2013be74a73c Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 20 Apr 2017 10:14:25 -0400 Subject: [PATCH] qa/suites/rados: switch require-luminous facet to use full_sequential_finally This lets us run multiple cleanup steps right before ceph teardown. Note that we drop the facet from multimon/ because it doesn't factor out cluster creation before this step properly. That's fine because the require_luminous cleanup shouldn't be related to the multimon tests. Signed-off-by: Sage Weil --- qa/suites/rados/basic/d-require-luminous | 1 + qa/suites/rados/basic/z-require-luminous | 1 - qa/suites/rados/monthrash/d-require-luminous | 1 + qa/suites/rados/monthrash/z-require-luminous | 1 - qa/suites/rados/multimon/z-require-luminous | 1 - qa/suites/rados/thrash-erasure-code-isa/ceph.yaml | 1 + qa/suites/rados/thrash-erasure-code/d-require-luminous | 1 + qa/suites/rados/thrash-erasure-code/z-require-luminous | 1 - .../{z-require-luminous => d-require-luminous}/at-end.yaml | 7 ++++--- .../at-mkfs.yaml | 0 qa/suites/rados/verify/d-require-luminous | 1 + .../rados/verify/{ceph-thrash => d-thrash}/default.yaml | 0 qa/suites/rados/verify/{ceph-thrash => d-thrash}/none.yaml | 0 qa/suites/rados/verify/z-require-luminous | 1 - 14 files changed, 9 insertions(+), 8 deletions(-) create mode 120000 qa/suites/rados/basic/d-require-luminous delete mode 120000 qa/suites/rados/basic/z-require-luminous create mode 120000 qa/suites/rados/monthrash/d-require-luminous delete mode 120000 qa/suites/rados/monthrash/z-require-luminous delete mode 120000 qa/suites/rados/multimon/z-require-luminous create mode 120000 qa/suites/rados/thrash-erasure-code-isa/ceph.yaml create mode 120000 qa/suites/rados/thrash-erasure-code/d-require-luminous delete mode 120000 qa/suites/rados/thrash-erasure-code/z-require-luminous rename qa/suites/rados/thrash/{z-require-luminous => d-require-luminous}/at-end.yaml (76%) rename qa/suites/rados/thrash/{z-require-luminous => d-require-luminous}/at-mkfs.yaml (100%) create mode 120000 qa/suites/rados/verify/d-require-luminous rename qa/suites/rados/verify/{ceph-thrash => d-thrash}/default.yaml (100%) rename qa/suites/rados/verify/{ceph-thrash => d-thrash}/none.yaml (100%) delete mode 120000 qa/suites/rados/verify/z-require-luminous diff --git a/qa/suites/rados/basic/d-require-luminous b/qa/suites/rados/basic/d-require-luminous new file mode 120000 index 00000000000..737aee82415 --- /dev/null +++ b/qa/suites/rados/basic/d-require-luminous @@ -0,0 +1 @@ +../thrash/d-require-luminous/ \ No newline at end of file diff --git a/qa/suites/rados/basic/z-require-luminous b/qa/suites/rados/basic/z-require-luminous deleted file mode 120000 index 483b23de56b..00000000000 --- a/qa/suites/rados/basic/z-require-luminous +++ /dev/null @@ -1 +0,0 @@ -../thrash/z-require-luminous \ No newline at end of file diff --git a/qa/suites/rados/monthrash/d-require-luminous b/qa/suites/rados/monthrash/d-require-luminous new file mode 120000 index 00000000000..737aee82415 --- /dev/null +++ b/qa/suites/rados/monthrash/d-require-luminous @@ -0,0 +1 @@ +../thrash/d-require-luminous/ \ No newline at end of file diff --git a/qa/suites/rados/monthrash/z-require-luminous b/qa/suites/rados/monthrash/z-require-luminous deleted file mode 120000 index 483b23de56b..00000000000 --- a/qa/suites/rados/monthrash/z-require-luminous +++ /dev/null @@ -1 +0,0 @@ -../thrash/z-require-luminous \ No newline at end of file diff --git a/qa/suites/rados/multimon/z-require-luminous b/qa/suites/rados/multimon/z-require-luminous deleted file mode 120000 index 483b23de56b..00000000000 --- a/qa/suites/rados/multimon/z-require-luminous +++ /dev/null @@ -1 +0,0 @@ -../thrash/z-require-luminous \ No newline at end of file diff --git a/qa/suites/rados/thrash-erasure-code-isa/ceph.yaml b/qa/suites/rados/thrash-erasure-code-isa/ceph.yaml new file mode 120000 index 00000000000..a2fd139cbff --- /dev/null +++ b/qa/suites/rados/thrash-erasure-code-isa/ceph.yaml @@ -0,0 +1 @@ +../thrash/ceph.yaml \ No newline at end of file diff --git a/qa/suites/rados/thrash-erasure-code/d-require-luminous b/qa/suites/rados/thrash-erasure-code/d-require-luminous new file mode 120000 index 00000000000..737aee82415 --- /dev/null +++ b/qa/suites/rados/thrash-erasure-code/d-require-luminous @@ -0,0 +1 @@ +../thrash/d-require-luminous/ \ No newline at end of file diff --git a/qa/suites/rados/thrash-erasure-code/z-require-luminous b/qa/suites/rados/thrash-erasure-code/z-require-luminous deleted file mode 120000 index 483b23de56b..00000000000 --- a/qa/suites/rados/thrash-erasure-code/z-require-luminous +++ /dev/null @@ -1 +0,0 @@ -../thrash/z-require-luminous \ No newline at end of file diff --git a/qa/suites/rados/thrash/z-require-luminous/at-end.yaml b/qa/suites/rados/thrash/d-require-luminous/at-end.yaml similarity index 76% rename from qa/suites/rados/thrash/z-require-luminous/at-end.yaml rename to qa/suites/rados/thrash/d-require-luminous/at-end.yaml index e3650821395..22868237d6e 100644 --- a/qa/suites/rados/thrash/z-require-luminous/at-end.yaml +++ b/qa/suites/rados/thrash/d-require-luminous/at-end.yaml @@ -2,9 +2,10 @@ # the end of the test run, then do a final scrub (to convert any # legacy snapsets), and verify we are healthy. tasks: -- exec_on_cleanup: - mon.a: - - ceph osd set require_luminous_osds +- full_sequential_finally: + - exec: + mon.a: + - ceph osd set require_luminous_osds overrides: ceph: conf: diff --git a/qa/suites/rados/thrash/z-require-luminous/at-mkfs.yaml b/qa/suites/rados/thrash/d-require-luminous/at-mkfs.yaml similarity index 100% rename from qa/suites/rados/thrash/z-require-luminous/at-mkfs.yaml rename to qa/suites/rados/thrash/d-require-luminous/at-mkfs.yaml diff --git a/qa/suites/rados/verify/d-require-luminous b/qa/suites/rados/verify/d-require-luminous new file mode 120000 index 00000000000..737aee82415 --- /dev/null +++ b/qa/suites/rados/verify/d-require-luminous @@ -0,0 +1 @@ +../thrash/d-require-luminous/ \ No newline at end of file diff --git a/qa/suites/rados/verify/ceph-thrash/default.yaml b/qa/suites/rados/verify/d-thrash/default.yaml similarity index 100% rename from qa/suites/rados/verify/ceph-thrash/default.yaml rename to qa/suites/rados/verify/d-thrash/default.yaml diff --git a/qa/suites/rados/verify/ceph-thrash/none.yaml b/qa/suites/rados/verify/d-thrash/none.yaml similarity index 100% rename from qa/suites/rados/verify/ceph-thrash/none.yaml rename to qa/suites/rados/verify/d-thrash/none.yaml diff --git a/qa/suites/rados/verify/z-require-luminous b/qa/suites/rados/verify/z-require-luminous deleted file mode 120000 index 483b23de56b..00000000000 --- a/qa/suites/rados/verify/z-require-luminous +++ /dev/null @@ -1 +0,0 @@ -../thrash/z-require-luminous \ No newline at end of file -- 2.39.5