From 90379e0b1dcd150fa7219fff520e33fd12909b4e Mon Sep 17 00:00:00 2001 From: tamil Date: Wed, 13 Aug 2014 09:09:30 -0700 Subject: [PATCH] Added a facet to test both apache and civetweb as frontend for rgw Signed-off-by: tamil --- suites/rgw/civetweb/% | 0 suites/rgw/civetweb/clusters/fixed-2.yaml | 1 - suites/rgw/civetweb/fs/btrfs.yaml | 1 - suites/rgw/civetweb/fs/ext4.yaml | 1 - suites/rgw/civetweb/fs/xfs.yaml | 1 - suites/rgw/civetweb/rgw_frontend/frontend.yaml | 3 --- suites/rgw/civetweb/tasks/rgw_bucket_quota.yaml | 8 -------- .../rgw/civetweb/tasks/rgw_multipart_upload.yaml | 8 -------- suites/rgw/civetweb/tasks/rgw_readwrite.yaml | 16 ---------------- suites/rgw/civetweb/tasks/rgw_roundtrip.yaml | 16 ---------------- suites/rgw/civetweb/tasks/rgw_s3tests.yaml | 7 ------- suites/rgw/civetweb/tasks/rgw_swift.yaml | 7 ------- suites/rgw/civetweb/tasks/rgw_user_quota.yaml | 8 -------- suites/rgw/multifs/frontend/apache.yaml | 3 +++ suites/rgw/multifs/frontend/civetweb.yaml | 3 +++ suites/rgw/singleton/frontend/apache.yaml | 3 +++ suites/rgw/singleton/frontend/civetweb.yaml | 3 +++ suites/rgw/verify/frontend/apache.yaml | 3 +++ suites/rgw/verify/frontend/civetweb.yaml | 3 +++ 19 files changed, 18 insertions(+), 77 deletions(-) delete mode 100644 suites/rgw/civetweb/% delete mode 120000 suites/rgw/civetweb/clusters/fixed-2.yaml delete mode 120000 suites/rgw/civetweb/fs/btrfs.yaml delete mode 120000 suites/rgw/civetweb/fs/ext4.yaml delete mode 120000 suites/rgw/civetweb/fs/xfs.yaml delete mode 100644 suites/rgw/civetweb/rgw_frontend/frontend.yaml delete mode 100644 suites/rgw/civetweb/tasks/rgw_bucket_quota.yaml delete mode 100644 suites/rgw/civetweb/tasks/rgw_multipart_upload.yaml delete mode 100644 suites/rgw/civetweb/tasks/rgw_readwrite.yaml delete mode 100644 suites/rgw/civetweb/tasks/rgw_roundtrip.yaml delete mode 100644 suites/rgw/civetweb/tasks/rgw_s3tests.yaml delete mode 100644 suites/rgw/civetweb/tasks/rgw_swift.yaml delete mode 100644 suites/rgw/civetweb/tasks/rgw_user_quota.yaml create mode 100644 suites/rgw/multifs/frontend/apache.yaml create mode 100644 suites/rgw/multifs/frontend/civetweb.yaml create mode 100644 suites/rgw/singleton/frontend/apache.yaml create mode 100644 suites/rgw/singleton/frontend/civetweb.yaml create mode 100644 suites/rgw/verify/frontend/apache.yaml create mode 100644 suites/rgw/verify/frontend/civetweb.yaml diff --git a/suites/rgw/civetweb/% b/suites/rgw/civetweb/% deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/suites/rgw/civetweb/clusters/fixed-2.yaml b/suites/rgw/civetweb/clusters/fixed-2.yaml deleted file mode 120000 index cd0791a14861d..0000000000000 --- a/suites/rgw/civetweb/clusters/fixed-2.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../clusters/fixed-2.yaml \ No newline at end of file diff --git a/suites/rgw/civetweb/fs/btrfs.yaml b/suites/rgw/civetweb/fs/btrfs.yaml deleted file mode 120000 index 10d0c3f1266e5..0000000000000 --- a/suites/rgw/civetweb/fs/btrfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/btrfs.yaml \ No newline at end of file diff --git a/suites/rgw/civetweb/fs/ext4.yaml b/suites/rgw/civetweb/fs/ext4.yaml deleted file mode 120000 index 65d7188693381..0000000000000 --- a/suites/rgw/civetweb/fs/ext4.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/ext4.yaml \ No newline at end of file diff --git a/suites/rgw/civetweb/fs/xfs.yaml b/suites/rgw/civetweb/fs/xfs.yaml deleted file mode 120000 index 4c28d731f6b45..0000000000000 --- a/suites/rgw/civetweb/fs/xfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/xfs.yaml \ No newline at end of file diff --git a/suites/rgw/civetweb/rgw_frontend/frontend.yaml b/suites/rgw/civetweb/rgw_frontend/frontend.yaml deleted file mode 100644 index 1d60d7a07f4f1..0000000000000 --- a/suites/rgw/civetweb/rgw_frontend/frontend.yaml +++ /dev/null @@ -1,3 +0,0 @@ -overrides - rgw: - frontend: civetweb diff --git a/suites/rgw/civetweb/tasks/rgw_bucket_quota.yaml b/suites/rgw/civetweb/tasks/rgw_bucket_quota.yaml deleted file mode 100644 index 767debdf3c885..0000000000000 --- a/suites/rgw/civetweb/tasks/rgw_bucket_quota.yaml +++ /dev/null @@ -1,8 +0,0 @@ -tasks: -- install: -- ceph: -- rgw: [client.0] -- workunit: - clients: - client.0: - - rgw/s3_bucket_quota.pl diff --git a/suites/rgw/civetweb/tasks/rgw_multipart_upload.yaml b/suites/rgw/civetweb/tasks/rgw_multipart_upload.yaml deleted file mode 100644 index 1781dee096ba4..0000000000000 --- a/suites/rgw/civetweb/tasks/rgw_multipart_upload.yaml +++ /dev/null @@ -1,8 +0,0 @@ -tasks: -- install: -- ceph: -- rgw: [client.0] -- workunit: - clients: - client.0: - - rgw/s3_multipart_upload.pl diff --git a/suites/rgw/civetweb/tasks/rgw_readwrite.yaml b/suites/rgw/civetweb/tasks/rgw_readwrite.yaml deleted file mode 100644 index c7efaa1c75791..0000000000000 --- a/suites/rgw/civetweb/tasks/rgw_readwrite.yaml +++ /dev/null @@ -1,16 +0,0 @@ -tasks: -- install: -- ceph: -- rgw: [client.0] -- s3readwrite: - client.0: - rgw_server: client.0 - readwrite: - bucket: rwtest - readers: 10 - writers: 3 - duration: 300 - files: - num: 10 - size: 2000 - stddev: 500 diff --git a/suites/rgw/civetweb/tasks/rgw_roundtrip.yaml b/suites/rgw/civetweb/tasks/rgw_roundtrip.yaml deleted file mode 100644 index 47b3c1894a223..0000000000000 --- a/suites/rgw/civetweb/tasks/rgw_roundtrip.yaml +++ /dev/null @@ -1,16 +0,0 @@ -tasks: -- install: -- ceph: -- rgw: [client.0] -- s3roundtrip: - client.0: - rgw_server: client.0 - roundtrip: - bucket: rttest - readers: 10 - writers: 3 - duration: 300 - files: - num: 10 - size: 2000 - stddev: 500 diff --git a/suites/rgw/civetweb/tasks/rgw_s3tests.yaml b/suites/rgw/civetweb/tasks/rgw_s3tests.yaml deleted file mode 100644 index 62608773a2ad6..0000000000000 --- a/suites/rgw/civetweb/tasks/rgw_s3tests.yaml +++ /dev/null @@ -1,7 +0,0 @@ -tasks: -- install: -- ceph: -- rgw: [client.0] -- s3tests: - client.0: - rgw_server: client.0 diff --git a/suites/rgw/civetweb/tasks/rgw_swift.yaml b/suites/rgw/civetweb/tasks/rgw_swift.yaml deleted file mode 100644 index 569741b0e150a..0000000000000 --- a/suites/rgw/civetweb/tasks/rgw_swift.yaml +++ /dev/null @@ -1,7 +0,0 @@ -tasks: -- install: -- ceph: -- rgw: [client.0] -- swift: - client.0: - rgw_server: client.0 diff --git a/suites/rgw/civetweb/tasks/rgw_user_quota.yaml b/suites/rgw/civetweb/tasks/rgw_user_quota.yaml deleted file mode 100644 index c2c38a816cc8c..0000000000000 --- a/suites/rgw/civetweb/tasks/rgw_user_quota.yaml +++ /dev/null @@ -1,8 +0,0 @@ -tasks: -- install: -- ceph: -- rgw: [client.0] -- workunit: - clients: - client.0: - - rgw/s3_user_quota.pl diff --git a/suites/rgw/multifs/frontend/apache.yaml b/suites/rgw/multifs/frontend/apache.yaml new file mode 100644 index 0000000000000..53ebf758ed3ce --- /dev/null +++ b/suites/rgw/multifs/frontend/apache.yaml @@ -0,0 +1,3 @@ +overrides: + rgw: + frontend: apache diff --git a/suites/rgw/multifs/frontend/civetweb.yaml b/suites/rgw/multifs/frontend/civetweb.yaml new file mode 100644 index 0000000000000..5845a0e6c15cf --- /dev/null +++ b/suites/rgw/multifs/frontend/civetweb.yaml @@ -0,0 +1,3 @@ +overrides: + rgw: + frontend: civetweb diff --git a/suites/rgw/singleton/frontend/apache.yaml b/suites/rgw/singleton/frontend/apache.yaml new file mode 100644 index 0000000000000..53ebf758ed3ce --- /dev/null +++ b/suites/rgw/singleton/frontend/apache.yaml @@ -0,0 +1,3 @@ +overrides: + rgw: + frontend: apache diff --git a/suites/rgw/singleton/frontend/civetweb.yaml b/suites/rgw/singleton/frontend/civetweb.yaml new file mode 100644 index 0000000000000..5845a0e6c15cf --- /dev/null +++ b/suites/rgw/singleton/frontend/civetweb.yaml @@ -0,0 +1,3 @@ +overrides: + rgw: + frontend: civetweb diff --git a/suites/rgw/verify/frontend/apache.yaml b/suites/rgw/verify/frontend/apache.yaml new file mode 100644 index 0000000000000..53ebf758ed3ce --- /dev/null +++ b/suites/rgw/verify/frontend/apache.yaml @@ -0,0 +1,3 @@ +overrides: + rgw: + frontend: apache diff --git a/suites/rgw/verify/frontend/civetweb.yaml b/suites/rgw/verify/frontend/civetweb.yaml new file mode 100644 index 0000000000000..5845a0e6c15cf --- /dev/null +++ b/suites/rgw/verify/frontend/civetweb.yaml @@ -0,0 +1,3 @@ +overrides: + rgw: + frontend: civetweb -- 2.39.5