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 <sage@redhat.com>

diff --git a/qa/suites/rados/basic/d-require-luminous b/qa/suites/rados/basic/d-require-luminous
new file mode 120000 (symlink)
index 0000000..737aee8
--- /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 (symlink)
index 483b23d..0000000
--- 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 (symlink)
index 0000000..737aee8
--- /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 (symlink)
index 483b23d..0000000
--- 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 (symlink)
index 483b23d..0000000
--- 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 (symlink)
index 0000000..a2fd139
--- /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 (symlink)
index 0000000..737aee8
--- /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 (symlink)
index 483b23d..0000000
--- 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/d-require-luminous/at-end.yaml b/qa/suites/rados/thrash/d-require-luminous/at-end.yaml
new file mode 100644 (file)
index 0000000..2286823
--- /dev/null
+++ b/qa/suites/rados/thrash/d-require-luminous/at-end.yaml
@@ -0,0 +1,15 @@
+# do not require luminous osds at mkfs time; only set flag at
+# the end of the test run, then do a final scrub (to convert any
+# legacy snapsets), and verify we are healthy.
+tasks:
+- full_sequential_finally:
+  - exec:
+      mon.a:
+        - ceph osd set require_luminous_osds
+overrides:
+  ceph:
+    conf:
+      global:
+        mon debug no require luminous: true
+  thrashosds:
+    chance_thrash_cluster_full: 0

diff --git a/qa/suites/rados/thrash/d-require-luminous/at-mkfs.yaml b/qa/suites/rados/thrash/d-require-luminous/at-mkfs.yaml
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/qa/suites/rados/thrash/z-require-luminous/at-end.yaml b/qa/suites/rados/thrash/z-require-luminous/at-end.yaml
deleted file mode 100644 (file)
index e365082..0000000
--- a/qa/suites/rados/thrash/z-require-luminous/at-end.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-# do not require luminous osds at mkfs time; only set flag at
-# 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
-overrides:
-  ceph:
-    conf:
-      global:
-        mon debug no require luminous: true
-  thrashosds:
-    chance_thrash_cluster_full: 0

diff --git a/qa/suites/rados/thrash/z-require-luminous/at-mkfs.yaml b/qa/suites/rados/thrash/z-require-luminous/at-mkfs.yaml
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/qa/suites/rados/verify/ceph-thrash/default.yaml b/qa/suites/rados/verify/ceph-thrash/default.yaml
deleted file mode 100644 (file)
index d67ff20..0000000
--- a/qa/suites/rados/verify/ceph-thrash/default.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-    - wrongly marked me down
-    - objects unfound and apparently lost
-tasks:
-- thrashosds:
-    timeout: 1200
-    chance_pgnum_grow: 1
-    chance_pgpnum_fix: 1

diff --git a/qa/suites/rados/verify/ceph-thrash/none.yaml b/qa/suites/rados/verify/ceph-thrash/none.yaml
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/qa/suites/rados/verify/d-require-luminous b/qa/suites/rados/verify/d-require-luminous
new file mode 120000 (symlink)
index 0000000..737aee8
--- /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/d-thrash/default.yaml b/qa/suites/rados/verify/d-thrash/default.yaml
new file mode 100644 (file)
index 0000000..d67ff20
--- /dev/null
+++ b/qa/suites/rados/verify/d-thrash/default.yaml
@@ -0,0 +1,10 @@
+overrides:
+  ceph:
+    log-whitelist:
+    - wrongly marked me down
+    - objects unfound and apparently lost
+tasks:
+- thrashosds:
+    timeout: 1200
+    chance_pgnum_grow: 1
+    chance_pgpnum_fix: 1

diff --git a/qa/suites/rados/verify/d-thrash/none.yaml b/qa/suites/rados/verify/d-thrash/none.yaml
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/qa/suites/rados/verify/z-require-luminous b/qa/suites/rados/verify/z-require-luminous
deleted file mode 120000 (symlink)
index 483b23d..0000000
--- a/qa/suites/rados/verify/z-require-luminous
+++ /dev/null
@@ -1 +0,0 @@
-../thrash/z-require-luminous
\ No newline at end of file