From bb56ac01c284f8b867cee0130e07419bdf4bf6a0 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Thu, 5 Sep 2019 15:54:10 -0400 Subject: [PATCH] qa/rgw: add new rgw/website suite for static website tests Signed-off-by: Casey Bodley --- qa/suites/rgw/website/% | 0 qa/suites/rgw/website/.qa | 1 + qa/suites/rgw/website/clusters/.qa | 1 + qa/suites/rgw/website/clusters/fixed-2.yaml | 1 + qa/suites/rgw/website/frontend | 1 + qa/suites/rgw/website/http.yaml | 1 + qa/suites/rgw/website/overrides.yaml | 25 +++++++++++++++++++ qa/suites/rgw/website/tasks/.qa | 1 + .../rgw/website/tasks/s3tests-website.yaml | 17 +++++++++++++ 9 files changed, 48 insertions(+) create mode 100644 qa/suites/rgw/website/% create mode 120000 qa/suites/rgw/website/.qa create mode 120000 qa/suites/rgw/website/clusters/.qa create mode 120000 qa/suites/rgw/website/clusters/fixed-2.yaml create mode 120000 qa/suites/rgw/website/frontend create mode 100644 qa/suites/rgw/website/http.yaml create mode 100644 qa/suites/rgw/website/overrides.yaml create mode 120000 qa/suites/rgw/website/tasks/.qa create mode 100644 qa/suites/rgw/website/tasks/s3tests-website.yaml diff --git a/qa/suites/rgw/website/% b/qa/suites/rgw/website/% new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/qa/suites/rgw/website/.qa b/qa/suites/rgw/website/.qa new file mode 120000 index 0000000000000..fea2489fdf6d9 --- /dev/null +++ b/qa/suites/rgw/website/.qa @@ -0,0 +1 @@ +../.qa \ No newline at end of file diff --git a/qa/suites/rgw/website/clusters/.qa b/qa/suites/rgw/website/clusters/.qa new file mode 120000 index 0000000000000..fea2489fdf6d9 --- /dev/null +++ b/qa/suites/rgw/website/clusters/.qa @@ -0,0 +1 @@ +../.qa \ No newline at end of file diff --git a/qa/suites/rgw/website/clusters/fixed-2.yaml b/qa/suites/rgw/website/clusters/fixed-2.yaml new file mode 120000 index 0000000000000..230ff0fdab412 --- /dev/null +++ b/qa/suites/rgw/website/clusters/fixed-2.yaml @@ -0,0 +1 @@ +.qa/clusters/fixed-2.yaml \ No newline at end of file diff --git a/qa/suites/rgw/website/frontend b/qa/suites/rgw/website/frontend new file mode 120000 index 0000000000000..926a53e838346 --- /dev/null +++ b/qa/suites/rgw/website/frontend @@ -0,0 +1 @@ +.qa/rgw_frontend \ No newline at end of file diff --git a/qa/suites/rgw/website/http.yaml b/qa/suites/rgw/website/http.yaml new file mode 100644 index 0000000000000..24cb6fc5d76fd --- /dev/null +++ b/qa/suites/rgw/website/http.yaml @@ -0,0 +1 @@ +# https tests would need to generate wildcard certificates; only test http for now diff --git a/qa/suites/rgw/website/overrides.yaml b/qa/suites/rgw/website/overrides.yaml new file mode 100644 index 0000000000000..b40a8f29716ae --- /dev/null +++ b/qa/suites/rgw/website/overrides.yaml @@ -0,0 +1,25 @@ +# see http://tracker.ceph.com/issues/20360 and http://tracker.ceph.com/issues/18126 +os_type: centos + +overrides: + install: + flavor: notcmalloc + ceph: + conf: + global: + osd_min_pg_log_entries: 10 + osd_max_pg_log_entries: 10 + client: + debug rgw: 20 + rgw crypt s3 kms encryption keys: testkey-1=YmluCmJvb3N0CmJvb3N0LWJ1aWxkCmNlcGguY29uZgo= testkey-2=aWIKTWFrZWZpbGUKbWFuCm91dApzcmMKVGVzdGluZwo= + rgw crypt require ssl: false + rgw enable static website: True + client.0: + rgw lc debug interval: 10 + client.1: + rgw enable apis: s3website + rgw: + client.0: + valgrind: [--tool=memcheck, --max-threads=1024] # http://tracker.ceph.com/issues/25214 + client.1: + valgrind: [--tool=memcheck, --max-threads=1024] # http://tracker.ceph.com/issues/25214 diff --git a/qa/suites/rgw/website/tasks/.qa b/qa/suites/rgw/website/tasks/.qa new file mode 120000 index 0000000000000..fea2489fdf6d9 --- /dev/null +++ b/qa/suites/rgw/website/tasks/.qa @@ -0,0 +1 @@ +../.qa \ No newline at end of file diff --git a/qa/suites/rgw/website/tasks/s3tests-website.yaml b/qa/suites/rgw/website/tasks/s3tests-website.yaml new file mode 100644 index 0000000000000..9ca6fcfbdb06a --- /dev/null +++ b/qa/suites/rgw/website/tasks/s3tests-website.yaml @@ -0,0 +1,17 @@ +tasks: +- install: +- ceph: +- dnsmasq: + client.0: + s3.: client.0 + s3-website.: client.1 +- rgw: + client.0: + dns-name: s3. + client.1: + dns-s3website-name: s3-website. +- s3tests: + client.0: + force-branch: ceph-master + rgw_server: client.0 + rgw_website_server: client.1 -- 2.39.5