From: Sage Weil <sage@redhat.com>
Date: Mon, 22 May 2017 14:15:23 +0000 (-0400)
Subject: qa/suites/rados: temporarily remove scrub_test from basic/ until post-luminous
X-Git-Tag: v12.1.0~10^2~12^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F15202%2Fhead;p=ceph.git

qa/suites/rados: temporarily remove scrub_test from basic/ until post-luminous

We don't want to do the at-end.yaml scrubbing business with this test.
Move it into a separate collection until after luminous.

I have a todo item on the post-luminous cleanup list to avoid forgetting
to move this back.

Fixes: http://tracker.ceph.com/issues/19935
Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/qa/suites/rados/basic-luminous/% b/qa/suites/rados/basic-luminous/%
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/qa/suites/rados/basic-luminous/ceph.yaml b/qa/suites/rados/basic-luminous/ceph.yaml
new file mode 120000
index 000000000000..1e1b9ef4aa3a
--- /dev/null
+++ b/qa/suites/rados/basic-luminous/ceph.yaml
@@ -0,0 +1 @@
+../basic/ceph.yaml
\ No newline at end of file
diff --git a/qa/suites/rados/basic-luminous/clusters b/qa/suites/rados/basic-luminous/clusters
new file mode 120000
index 000000000000..ae92569e8aaf
--- /dev/null
+++ b/qa/suites/rados/basic-luminous/clusters
@@ -0,0 +1 @@
+../basic/clusters
\ No newline at end of file
diff --git a/qa/suites/rados/basic-luminous/objectstore b/qa/suites/rados/basic-luminous/objectstore
new file mode 120000
index 000000000000..f81a13b6864b
--- /dev/null
+++ b/qa/suites/rados/basic-luminous/objectstore
@@ -0,0 +1 @@
+../basic/objectstore
\ No newline at end of file
diff --git a/qa/suites/rados/basic-luminous/rados.yaml b/qa/suites/rados/basic-luminous/rados.yaml
new file mode 120000
index 000000000000..9b356bf34860
--- /dev/null
+++ b/qa/suites/rados/basic-luminous/rados.yaml
@@ -0,0 +1 @@
+../basic/rados.yaml
\ No newline at end of file
diff --git a/qa/suites/rados/basic-luminous/scrub_test.yaml b/qa/suites/rados/basic-luminous/scrub_test.yaml
new file mode 100644
index 000000000000..1847f80d46b1
--- /dev/null
+++ b/qa/suites/rados/basic-luminous/scrub_test.yaml
@@ -0,0 +1,21 @@
+overrides:
+  ceph:
+    log-whitelist:
+    - '!= data_digest'
+    - '!= omap_digest'
+    - '!= size'
+    - 'deep-scrub 0 missing, 1 inconsistent objects'
+    - 'deep-scrub [0-9]+ errors'
+    - 'repair 0 missing, 1 inconsistent objects'
+    - 'repair [0-9]+ errors, [0-9]+ fixed'
+    - 'shard [0-9]+ missing'
+    - 'deep-scrub 1 missing, 1 inconsistent objects'
+    - 'does not match object info size'
+    - 'attr name mistmatch'
+    - 'deep-scrub 1 missing, 0 inconsistent objects'
+    - 'failed to pick suitable auth object'
+    conf:
+      osd:
+        osd deep scrub update digest min age: 0
+tasks:
+- scrub_test:
diff --git a/qa/suites/rados/basic/tasks/scrub_test.yaml b/qa/suites/rados/basic/tasks/scrub_test.yaml
deleted file mode 100644
index 1847f80d46b1..000000000000
--- a/qa/suites/rados/basic/tasks/scrub_test.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-    - '!= data_digest'
-    - '!= omap_digest'
-    - '!= size'
-    - 'deep-scrub 0 missing, 1 inconsistent objects'
-    - 'deep-scrub [0-9]+ errors'
-    - 'repair 0 missing, 1 inconsistent objects'
-    - 'repair [0-9]+ errors, [0-9]+ fixed'
-    - 'shard [0-9]+ missing'
-    - 'deep-scrub 1 missing, 1 inconsistent objects'
-    - 'does not match object info size'
-    - 'attr name mistmatch'
-    - 'deep-scrub 1 missing, 0 inconsistent objects'
-    - 'failed to pick suitable auth object'
-    conf:
-      osd:
-        osd deep scrub update digest min age: 0
-tasks:
-- scrub_test: