From b497d9fdd3a0893836d56e2d1487820ea54ec707 Mon Sep 17 00:00:00 2001
From: Casey Bodley <cbodley@redhat.com>
Date: Tue, 6 Mar 2018 14:02:37 -0500
Subject: [PATCH] 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>
---
 qa/suites/rgw/verify/tasks/rgw_ragweed.yaml   | 25 -------------------
 qa/suites/rgw/verify/tasks/rgw_swift.yaml     | 13 ----------
 .../{rgw_s3tests.yaml => rgw_tests.yaml}      |  8 ++++++
 3 files changed, 8 insertions(+), 38 deletions(-)
 delete mode 100644 qa/suites/rgw/verify/tasks/rgw_ragweed.yaml
 delete mode 100644 qa/suites/rgw/verify/tasks/rgw_swift.yaml
 rename qa/suites/rgw/verify/tasks/{rgw_s3tests.yaml => rgw_tests.yaml} (73%)

diff --git a/qa/suites/rgw/verify/tasks/rgw_ragweed.yaml b/qa/suites/rgw/verify/tasks/rgw_ragweed.yaml
deleted file mode 100644
index ab45a13f26f..00000000000
--- a/qa/suites/rgw/verify/tasks/rgw_ragweed.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-os_type: centos   # xenial valgrind buggy, see http://tracker.ceph.com/issues/18126
-tasks:
-- install:
-    flavor: notcmalloc
-    debuginfo: true
-- ceph:
-- rgw:
-    client.0:
-      valgrind: [--tool=memcheck]
-- ragweed:
-    client.0:
-      force-branch: ceph-master
-      rgw_server: client.0
-      stages: prepare
-- ragweed:
-    client.0:
-      force-branch: ceph-master
-      rgw_server: client.0
-      stages: check
-overrides:
-  ceph:
-    conf:
-      global:
-        osd_min_pg_log_entries: 10
-        osd_max_pg_log_entries: 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 9b3aa6febdc..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]
-- swift:
-    client.0:
-      rgw_server: client.0
diff --git a/qa/suites/rgw/verify/tasks/rgw_s3tests.yaml b/qa/suites/rgw/verify/tasks/rgw_tests.yaml
similarity index 73%
rename from qa/suites/rgw/verify/tasks/rgw_s3tests.yaml
rename to qa/suites/rgw/verify/tasks/rgw_tests.yaml
index bed9f0e1900..ccc4988d9e7 100644
--- a/qa/suites/rgw/verify/tasks/rgw_s3tests.yaml
+++ b/qa/suites/rgw/verify/tasks/rgw_tests.yaml
@@ -12,6 +12,14 @@ tasks:
     client.0:
       force-branch: ceph-master
       rgw_server: client.0
+- swift:
+    client.0:
+      rgw_server: client.0
+- ragweed:
+    client.0:
+      force-branch: ceph-master
+      rgw_server: client.0
+      stages: prepare,check
 overrides:
   ceph:
     conf:
-- 
2.39.5