From ce8a22afbe268b2955cc7968a01ed7dba2c7bf37 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Tue, 13 Feb 2018 13:43:46 -0500 Subject: [PATCH] qa/rgw: verify suite tests civetweb with ssl Signed-off-by: Casey Bodley --- qa/suites/rgw/verify/frontend | 1 - qa/suites/rgw/verify/frontend/beast.yaml | 1 + qa/suites/rgw/verify/frontend/civetweb.yaml | 1 + .../rgw/verify/frontend/civetweb_ssl.yaml | 21 +++++++++++++++++++ qa/suites/rgw/verify/tasks/rgw_tests.yaml | 1 + 5 files changed, 24 insertions(+), 1 deletion(-) delete mode 120000 qa/suites/rgw/verify/frontend create mode 120000 qa/suites/rgw/verify/frontend/beast.yaml create mode 120000 qa/suites/rgw/verify/frontend/civetweb.yaml create mode 100644 qa/suites/rgw/verify/frontend/civetweb_ssl.yaml diff --git a/qa/suites/rgw/verify/frontend b/qa/suites/rgw/verify/frontend deleted file mode 120000 index f67cecad07510..0000000000000 --- a/qa/suites/rgw/verify/frontend +++ /dev/null @@ -1 +0,0 @@ -../../../rgw_frontend \ No newline at end of file diff --git a/qa/suites/rgw/verify/frontend/beast.yaml b/qa/suites/rgw/verify/frontend/beast.yaml new file mode 120000 index 0000000000000..d07a47b4f874f --- /dev/null +++ b/qa/suites/rgw/verify/frontend/beast.yaml @@ -0,0 +1 @@ +../../../../rgw_frontend/beast.yaml \ No newline at end of file diff --git a/qa/suites/rgw/verify/frontend/civetweb.yaml b/qa/suites/rgw/verify/frontend/civetweb.yaml new file mode 120000 index 0000000000000..48cea2e756342 --- /dev/null +++ b/qa/suites/rgw/verify/frontend/civetweb.yaml @@ -0,0 +1 @@ +../../../../rgw_frontend/civetweb.yaml \ No newline at end of file diff --git a/qa/suites/rgw/verify/frontend/civetweb_ssl.yaml b/qa/suites/rgw/verify/frontend/civetweb_ssl.yaml new file mode 100644 index 0000000000000..9d4368ee53911 --- /dev/null +++ b/qa/suites/rgw/verify/frontend/civetweb_ssl.yaml @@ -0,0 +1,21 @@ +overrides: + ssl: + root: + client: client.0 + key-type: rsa:4096 + cn: teuthology + install: [client.0, client.1] + rgw.client.0: + client: client.0 + ca: root + embed-key: true + rgw.client.1: + client: client.1 + ca: root + embed-key: true + rgw: + frontend: civetweb + client.0: + ssl certificate: rgw.client.0 + client.1: + ssl certificate: rgw.client.1 diff --git a/qa/suites/rgw/verify/tasks/rgw_tests.yaml b/qa/suites/rgw/verify/tasks/rgw_tests.yaml index ccc4988d9e795..be55267e5412c 100644 --- a/qa/suites/rgw/verify/tasks/rgw_tests.yaml +++ b/qa/suites/rgw/verify/tasks/rgw_tests.yaml @@ -5,6 +5,7 @@ tasks: - install: flavor: notcmalloc - ceph: +- ssl: - rgw: client.0: valgrind: [--tool=memcheck] -- 2.39.5