From: Casey Bodley <cbodley@redhat.com>
Date: Tue, 6 Mar 2018 19:02:37 +0000 (-0500)
Subject: qa/rgw: combine swift, s3tests, ragweed into single verify task
X-Git-Tag: v12.2.9~51^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5312e05382bbeafbafed8ae268d16d8c374f7dfb;p=ceph.git

qa/rgw: combine swift, s3tests, ragweed into single verify task

these tests don't need to be split across the job matrix the same way
that we split features like frontend, ssl, objectstore, etc. by
combining them, we can still test the whole matrix of features, but with
only 1/3 of the total jobs

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

Conflicts:
	qa/suites/rgw/verify/tasks/rgw_tests.yaml
	qa/suites/rgw/verify/tasks/rgw_swift.yaml
---

diff --git a/qa/suites/rgw/verify/tasks/rgw_s3tests.yaml b/qa/suites/rgw/verify/tasks/rgw_s3tests.yaml
deleted file mode 100644
index a21011f1b32..00000000000
--- a/qa/suites/rgw/verify/tasks/rgw_s3tests.yaml
+++ /dev/null
@@ -1,22 +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
-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/rgw_swift.yaml b/qa/suites/rgw/verify/tasks/rgw_swift.yaml
deleted file mode 100644
index 042fb5ded00..00000000000
--- a/qa/suites/rgw/verify/tasks/rgw_swift.yaml
+++ /dev/null
@@ -1,13 +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
-- swift:
-    client.0:
-      rgw_server: client.0
diff --git a/qa/suites/rgw/verify/tasks/rgw_tests.yaml b/qa/suites/rgw/verify/tasks/rgw_tests.yaml
new file mode 100644
index 00000000000..f7d59232777
--- /dev/null
+++ b/qa/suites/rgw/verify/tasks/rgw_tests.yaml
@@ -0,0 +1,30 @@
+# 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