From: Casey Bodley <cbodley@redhat.com>
Date: Fri, 16 Mar 2018 20:25:40 +0000 (-0400)
Subject: qa/rgw: reorganize verify tasks
X-Git-Tag: v12.2.9~51^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e3ec5f41a70b2696e26701af06120feda23f861c;p=ceph.git

qa/rgw: reorganize verify tasks

split the verify suite tasks back into separate yaml files, using + to
combine them into a single job

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 64e20c3a6a208533f32b6ae4e2cada80ec5a0a21)

Conflicts:
	qa/suites/rgw/verify/tasks/0-install.yaml
        qa/suites/rgw/verify/tasks/ragweed.yaml
        qa/suites/rgw/verify/tasks/s3tests.yaml
---

diff --git a/qa/suites/rgw/verify/tasks/+ b/qa/suites/rgw/verify/tasks/+
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/qa/suites/rgw/verify/tasks/0-install.yaml b/qa/suites/rgw/verify/tasks/0-install.yaml
new file mode 100644
index 00000000000..0b5dce44585
--- /dev/null
+++ b/qa/suites/rgw/verify/tasks/0-install.yaml
@@ -0,0 +1,19 @@
+# see http://tracker.ceph.com/issues/20360 and http://tracker.ceph.com/issues/18126
+os_type: centos
+
+tasks:
+- install:
+    flavor: notcmalloc
+- ceph:
+- rgw:
+    client.0:
+      valgrind: [--tool=memcheck, --max-threads=1024] # http://tracker.ceph.com/issues/25214
+
+overrides:
+  ceph:
+    conf:
+      global:
+        osd_min_pg_log_entries: 10
+        osd_max_pg_log_entries: 10
+      client:
+        rgw lc debug interval: 10
diff --git a/qa/suites/rgw/verify/tasks/ragweed.yaml b/qa/suites/rgw/verify/tasks/ragweed.yaml
new file mode 100644
index 00000000000..85e36464965
--- /dev/null
+++ b/qa/suites/rgw/verify/tasks/ragweed.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ragweed:
+    client.0:
+      force-branch: ceph-luminous
+      rgw_server: client.0
+      stages: prepare,check
diff --git a/qa/suites/rgw/verify/tasks/rgw_tests.yaml b/qa/suites/rgw/verify/tasks/rgw_tests.yaml
deleted file mode 100644
index f7d59232777..00000000000
--- a/qa/suites/rgw/verify/tasks/rgw_tests.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-# see http://tracker.ceph.com/issues/20360 and http://tracker.ceph.com/issues/18126
-os_type: centos
-
-tasks:
-- install:
-    flavor: notcmalloc
-- ceph:
-- rgw:
-    client.0:
-      valgrind: [--tool=memcheck, --max-threads=1024] # http://tracker.ceph.com/issues/25214
-- s3tests:
-    client.0:
-      force-branch: ceph-luminous
-      rgw_server: client.0
-- swift:
-    client.0:
-      rgw_server: client.0
-- ragweed:
-    client.0:
-      force-branch: ceph-luminous
-      rgw_server: client.0
-      stages: prepare,check
-overrides:
-  ceph:
-    conf:
-      global:
-        osd_min_pg_log_entries: 10
-        osd_max_pg_log_entries: 10
-      client:
-        rgw lc debug interval: 10
diff --git a/qa/suites/rgw/verify/tasks/s3tests.yaml b/qa/suites/rgw/verify/tasks/s3tests.yaml
new file mode 100644
index 00000000000..5900e0ccf33
--- /dev/null
+++ b/qa/suites/rgw/verify/tasks/s3tests.yaml
@@ -0,0 +1,5 @@
+tasks:
+- s3tests:
+    client.0:
+      force-branch: ceph-luminous
+      rgw_server: client.0
diff --git a/qa/suites/rgw/verify/tasks/swift.yaml b/qa/suites/rgw/verify/tasks/swift.yaml
new file mode 100644
index 00000000000..45e2fc9cc30
--- /dev/null
+++ b/qa/suites/rgw/verify/tasks/swift.yaml
@@ -0,0 +1,4 @@
+tasks:
+- swift:
+    client.0:
+      rgw_server: client.0