From 766229b03412124f21d6c4e94518c332ee8d0bfb Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Sun, 23 Jul 2017 22:05:59 -0400
Subject: [PATCH] qa/standalone/scrub: separate scrub/repair tests from rest of
 osd/

They are slow.  Run them separately.

Signed-off-by: Sage Weil <sage@redhat.com>
---
 .../{osd => scrub}/osd-scrub-repair.sh         |  4 +++-
 .../{osd => scrub}/osd-scrub-snaps.sh          |  0
 qa/suites/rados/standalone/scrub.yaml          | 18 ++++++++++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)
 rename qa/standalone/{osd => scrub}/osd-scrub-repair.sh (99%)
 rename qa/standalone/{osd => scrub}/osd-scrub-snaps.sh (100%)
 create mode 100644 qa/suites/rados/standalone/scrub.yaml

diff --git a/qa/standalone/osd/osd-scrub-repair.sh b/qa/standalone/scrub/osd-scrub-repair.sh
similarity index 99%
rename from qa/standalone/osd/osd-scrub-repair.sh
rename to qa/standalone/scrub/osd-scrub-repair.sh
index 26c7772613fc4..14b933233fac9 100755
--- a/qa/standalone/osd/osd-scrub-repair.sh
+++ b/qa/standalone/scrub/osd-scrub-repair.sh
@@ -487,6 +487,7 @@ function TEST_corrupt_scrub_replicated() {
     create_rbd_pool || return 1
     wait_for_clean || return 1
 
+    ceph osd pool create foo 1 || return 1
     ceph osd pool create $poolname 1 1 || return 1
     wait_for_clean || return 1
 
@@ -1614,9 +1615,10 @@ function corrupt_scrub_erasure() {
 	fi
     done
     create_rbd_pool || return 1
-    wait_for_clean || return 1
+    ceph osd pool create foo 1
 
     create_ec_pool $poolname $allow_overwrites k=2 m=1 stripe_unit=2K --force || return 1
+    wait_for_clean || return 1
 
     for i in $(seq 1 $total_objs) ; do
         objname=EOBJ${i}
diff --git a/qa/standalone/osd/osd-scrub-snaps.sh b/qa/standalone/scrub/osd-scrub-snaps.sh
similarity index 100%
rename from qa/standalone/osd/osd-scrub-snaps.sh
rename to qa/standalone/scrub/osd-scrub-snaps.sh
diff --git a/qa/suites/rados/standalone/scrub.yaml b/qa/suites/rados/standalone/scrub.yaml
new file mode 100644
index 0000000000000..7f6fad406117f
--- /dev/null
+++ b/qa/suites/rados/standalone/scrub.yaml
@@ -0,0 +1,18 @@
+roles:
+- - mon.a
+  - mgr.x
+  - osd.0
+  - osd.1
+  - osd.2
+  - client.0
+openstack:
+  - volumes: # attached to each instance
+      count: 3
+      size: 10 # GB
+tasks:
+- install:
+- workunit:
+    basedir: qa/standalone
+    clients:
+      all:
+        - scrub
-- 
2.39.5