From e3ec5f41a70b2696e26701af06120feda23f861c Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Fri, 16 Mar 2018 16:25:40 -0400 Subject: [PATCH] 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 (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 --- qa/suites/rgw/verify/tasks/+ | 0 .../verify/tasks/{rgw_tests.yaml => 0-install.yaml} | 13 +------------ qa/suites/rgw/verify/tasks/ragweed.yaml | 6 ++++++ qa/suites/rgw/verify/tasks/s3tests.yaml | 5 +++++ qa/suites/rgw/verify/tasks/swift.yaml | 4 ++++ 5 files changed, 16 insertions(+), 12 deletions(-) create mode 100644 qa/suites/rgw/verify/tasks/+ rename qa/suites/rgw/verify/tasks/{rgw_tests.yaml => 0-install.yaml} (62%) create mode 100644 qa/suites/rgw/verify/tasks/ragweed.yaml create mode 100644 qa/suites/rgw/verify/tasks/s3tests.yaml create mode 100644 qa/suites/rgw/verify/tasks/swift.yaml diff --git a/qa/suites/rgw/verify/tasks/+ b/qa/suites/rgw/verify/tasks/+ new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/qa/suites/rgw/verify/tasks/rgw_tests.yaml b/qa/suites/rgw/verify/tasks/0-install.yaml similarity index 62% rename from qa/suites/rgw/verify/tasks/rgw_tests.yaml rename to qa/suites/rgw/verify/tasks/0-install.yaml index f7d59232777b5..0b5dce4458593 100644 --- a/qa/suites/rgw/verify/tasks/rgw_tests.yaml +++ b/qa/suites/rgw/verify/tasks/0-install.yaml @@ -8,18 +8,7 @@ tasks: - 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: diff --git a/qa/suites/rgw/verify/tasks/ragweed.yaml b/qa/suites/rgw/verify/tasks/ragweed.yaml new file mode 100644 index 0000000000000..85e36464965e8 --- /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/s3tests.yaml b/qa/suites/rgw/verify/tasks/s3tests.yaml new file mode 100644 index 0000000000000..5900e0ccf33e1 --- /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 0000000000000..45e2fc9cc3088 --- /dev/null +++ b/qa/suites/rgw/verify/tasks/swift.yaml @@ -0,0 +1,4 @@ +tasks: +- swift: + client.0: + rgw_server: client.0 -- 2.39.5