From 19fcec84d8d7d21e796c7624e521b60d28ee21ed Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 7 Apr 2024 20:45:59 +0200 Subject: Adding upstream version 16.2.11+ds. Signed-off-by: Daniel Baumann --- qa/suites/teuthology/rgw/tasks/.qa | 1 + .../teuthology/rgw/tasks/s3tests-civetweb.yaml | 24 ++++++++++++++++++++ .../teuthology/rgw/tasks/s3tests-fastcgi.yaml | 24 ++++++++++++++++++++ qa/suites/teuthology/rgw/tasks/s3tests-fcgi.yaml | 26 ++++++++++++++++++++++ 4 files changed, 75 insertions(+) create mode 120000 qa/suites/teuthology/rgw/tasks/.qa create mode 100644 qa/suites/teuthology/rgw/tasks/s3tests-civetweb.yaml create mode 100644 qa/suites/teuthology/rgw/tasks/s3tests-fastcgi.yaml create mode 100644 qa/suites/teuthology/rgw/tasks/s3tests-fcgi.yaml (limited to 'qa/suites/teuthology/rgw/tasks') diff --git a/qa/suites/teuthology/rgw/tasks/.qa b/qa/suites/teuthology/rgw/tasks/.qa new file mode 120000 index 000000000..a602a0353 --- /dev/null +++ b/qa/suites/teuthology/rgw/tasks/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/teuthology/rgw/tasks/s3tests-civetweb.yaml b/qa/suites/teuthology/rgw/tasks/s3tests-civetweb.yaml new file mode 100644 index 000000000..cd3e8cf3d --- /dev/null +++ b/qa/suites/teuthology/rgw/tasks/s3tests-civetweb.yaml @@ -0,0 +1,24 @@ +# this runs s3tests against rgw, using civetweb +roles: +- [mon.a, mon.c, osd.0, osd.1, osd.2, client.0] +- [mon.b, mgr.x, osd.3, osd.4, osd.5, client.1] + +tasks: +- install: + branch: master +- ceph: +- rgw: [client.0] +- s3tests: + client.0: + rgw_server: client.0 + force-branch: ceph-pacific +overrides: + ceph: + fs: xfs + conf: + client: + debug rgw: 20 + rgw lc debug interval: 10 + rgw: + ec-data-pool: false + frontend: civetweb diff --git a/qa/suites/teuthology/rgw/tasks/s3tests-fastcgi.yaml b/qa/suites/teuthology/rgw/tasks/s3tests-fastcgi.yaml new file mode 100644 index 000000000..e6ba864ca --- /dev/null +++ b/qa/suites/teuthology/rgw/tasks/s3tests-fastcgi.yaml @@ -0,0 +1,24 @@ +# this runs s3tests against rgw, using mod_fastcgi +roles: +- [mon.a, mon.c, osd.0, osd.1, osd.2, client.0] +- [mon.b, mgr.x, osd.3, osd.4, osd.5, client.1] + +tasks: +- install: + branch: master +- ceph: +- rgw: [client.0] +- s3tests: + client.0: + rgw_server: client.0 + force-branch: ceph-pacific +overrides: + ceph: + fs: xfs + conf: + client: + debug rgw: 20 + rgw lc debug interval: 10 + rgw: + ec-data-pool: false + frontend: apache diff --git a/qa/suites/teuthology/rgw/tasks/s3tests-fcgi.yaml b/qa/suites/teuthology/rgw/tasks/s3tests-fcgi.yaml new file mode 100644 index 000000000..68a531bb3 --- /dev/null +++ b/qa/suites/teuthology/rgw/tasks/s3tests-fcgi.yaml @@ -0,0 +1,26 @@ +# this runs s3tests against rgw, using mod_proxy_fcgi +# the choice between uds or tcp with mod_proxy_fcgi depends on the distro +roles: +- [mon.a, mon.c, osd.0, osd.1, osd.2, client.0] +- [mon.b, mgr.x, osd.3, osd.4, osd.5, client.1] + +tasks: +- install: + branch: master +- ceph: +- rgw: [client.0] +- s3tests: + client.0: + rgw_server: client.0 + force-branch: ceph-pacific +overrides: + ceph: + fs: xfs + conf: + client: + debug rgw: 20 + rgw lc debug interval: 10 + rgw: + ec-data-pool: false + frontend: apache + use_fcgi: true -- cgit v1.2.3