From 5312e05382bbeafbafed8ae268d16d8c374f7dfb Mon Sep 17 00:00:00 2001 From: Casey Bodley 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 (cherry picked from commit b497d9fdd3a0893836d56e2d1487820ea54ec707) Conflicts: qa/suites/rgw/verify/tasks/rgw_tests.yaml qa/suites/rgw/verify/tasks/rgw_swift.yaml --- qa/suites/rgw/verify/tasks/rgw_swift.yaml | 13 ------------- .../tasks/{rgw_s3tests.yaml => rgw_tests.yaml} | 8 ++++++++ 2 files changed, 8 insertions(+), 13 deletions(-) delete mode 100644 qa/suites/rgw/verify/tasks/rgw_swift.yaml rename qa/suites/rgw/verify/tasks/{rgw_s3tests.yaml => rgw_tests.yaml} (75%) 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 042fb5ded0065..0000000000000 --- 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_s3tests.yaml b/qa/suites/rgw/verify/tasks/rgw_tests.yaml similarity index 75% rename from qa/suites/rgw/verify/tasks/rgw_s3tests.yaml rename to qa/suites/rgw/verify/tasks/rgw_tests.yaml index a21011f1b32e2..f7d59232777b5 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-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: -- 2.39.5