From 6b9586839a2dbe43f8957d10908a2ce0c5ce009c Mon Sep 17 00:00:00 2001 From: Tejas Chandramouli Date: Tue, 10 Dec 2019 19:05:56 +0530 Subject: [PATCH] Changes to remove references to os_type "ubuntu" and "centos" hardcodings Signed-off-by: TejasC88 --- qa/suites/rgw/multifs/tasks/rgw_bucket_quota.yaml | 1 - qa/suites/rgw/multifs/tasks/rgw_multipart_upload.yaml | 1 - qa/suites/rgw/multifs/tasks/rgw_user_quota.yaml | 1 - qa/suites/rgw/multisite/tasks/test_multi.yaml | 2 +- qa/suites/rgw/multisite/valgrind.yaml | 2 +- qa/suites/rgw/tempest/distro/valgrind.yaml | 2 +- qa/suites/rgw/thrash/workload/rgw_bucket_quota.yaml | 2 +- qa/suites/rgw/thrash/workload/rgw_multipart_upload.yaml | 2 +- qa/suites/rgw/thrash/workload/rgw_user_quota.yaml | 2 +- qa/suites/rgw/verify/tasks/0-install.yaml | 2 +- qa/suites/rgw/verify/validater/valgrind.yaml | 2 +- 11 files changed, 8 insertions(+), 11 deletions(-) diff --git a/qa/suites/rgw/multifs/tasks/rgw_bucket_quota.yaml b/qa/suites/rgw/multifs/tasks/rgw_bucket_quota.yaml index c518d0e14caff..f6bb7f54ff2d7 100644 --- a/qa/suites/rgw/multifs/tasks/rgw_bucket_quota.yaml +++ b/qa/suites/rgw/multifs/tasks/rgw_bucket_quota.yaml @@ -1,5 +1,4 @@ # Amazon/S3.pm (cpan) not available as an rpm -os_type: ubuntu tasks: - install: - ceph: diff --git a/qa/suites/rgw/multifs/tasks/rgw_multipart_upload.yaml b/qa/suites/rgw/multifs/tasks/rgw_multipart_upload.yaml index b042aa80c65b7..cff477b1a62dc 100644 --- a/qa/suites/rgw/multifs/tasks/rgw_multipart_upload.yaml +++ b/qa/suites/rgw/multifs/tasks/rgw_multipart_upload.yaml @@ -1,5 +1,4 @@ # Amazon::S3 is not available on el7 -os_type: ubuntu tasks: - install: - ceph: diff --git a/qa/suites/rgw/multifs/tasks/rgw_user_quota.yaml b/qa/suites/rgw/multifs/tasks/rgw_user_quota.yaml index ef9d6df110e6e..fea3bb65719df 100644 --- a/qa/suites/rgw/multifs/tasks/rgw_user_quota.yaml +++ b/qa/suites/rgw/multifs/tasks/rgw_user_quota.yaml @@ -1,5 +1,4 @@ # Amazon/S3.pm (cpan) not available as an rpm -os_type: ubuntu tasks: - install: - ceph: diff --git a/qa/suites/rgw/multisite/tasks/test_multi.yaml b/qa/suites/rgw/multisite/tasks/test_multi.yaml index 22b292f8d774f..b91a7c6d8bb2f 100644 --- a/qa/suites/rgw/multisite/tasks/test_multi.yaml +++ b/qa/suites/rgw/multisite/tasks/test_multi.yaml @@ -1,5 +1,5 @@ # see http://tracker.ceph.com/issues/20360 and http://tracker.ceph.com/issues/18126 -os_type: centos +# os_type: centos tasks: - install: diff --git a/qa/suites/rgw/multisite/valgrind.yaml b/qa/suites/rgw/multisite/valgrind.yaml index 08fad9da02381..affeaaaf1de50 100644 --- a/qa/suites/rgw/multisite/valgrind.yaml +++ b/qa/suites/rgw/multisite/valgrind.yaml @@ -1,5 +1,5 @@ # see http://tracker.ceph.com/issues/20360 and http://tracker.ceph.com/issues/18126 -os_type: centos +# os_type: centos overrides: install: diff --git a/qa/suites/rgw/tempest/distro/valgrind.yaml b/qa/suites/rgw/tempest/distro/valgrind.yaml index b66021bfabb32..4eca206d66604 100644 --- a/qa/suites/rgw/tempest/distro/valgrind.yaml +++ b/qa/suites/rgw/tempest/distro/valgrind.yaml @@ -1,4 +1,4 @@ -os_type: centos +# os_type: centos overrides: rgw: client.0: diff --git a/qa/suites/rgw/thrash/workload/rgw_bucket_quota.yaml b/qa/suites/rgw/thrash/workload/rgw_bucket_quota.yaml index 32e6af59f91b3..7fc59a562c763 100644 --- a/qa/suites/rgw/thrash/workload/rgw_bucket_quota.yaml +++ b/qa/suites/rgw/thrash/workload/rgw_bucket_quota.yaml @@ -1,5 +1,5 @@ # Amazon/S3.pm (cpan) not available as an rpm -os_type: ubuntu +#os_type: ubuntu tasks: - workunit: clients: diff --git a/qa/suites/rgw/thrash/workload/rgw_multipart_upload.yaml b/qa/suites/rgw/thrash/workload/rgw_multipart_upload.yaml index b792336d5b5c8..fe397873b5cc1 100644 --- a/qa/suites/rgw/thrash/workload/rgw_multipart_upload.yaml +++ b/qa/suites/rgw/thrash/workload/rgw_multipart_upload.yaml @@ -1,5 +1,5 @@ # Amazon::S3 is not available on el7 -os_type: ubuntu +#os_type: ubuntu tasks: - workunit: clients: diff --git a/qa/suites/rgw/thrash/workload/rgw_user_quota.yaml b/qa/suites/rgw/thrash/workload/rgw_user_quota.yaml index 0a9888276feae..8fe2aaf1ffe10 100644 --- a/qa/suites/rgw/thrash/workload/rgw_user_quota.yaml +++ b/qa/suites/rgw/thrash/workload/rgw_user_quota.yaml @@ -1,5 +1,5 @@ # Amazon/S3.pm (cpan) not available as an rpm -os_type: ubuntu +#os_type: ubuntu tasks: - workunit: clients: diff --git a/qa/suites/rgw/verify/tasks/0-install.yaml b/qa/suites/rgw/verify/tasks/0-install.yaml index d623bbb3493f5..3eb0f9bc30091 100644 --- a/qa/suites/rgw/verify/tasks/0-install.yaml +++ b/qa/suites/rgw/verify/tasks/0-install.yaml @@ -1,5 +1,5 @@ # see http://tracker.ceph.com/issues/20360 and http://tracker.ceph.com/issues/18126 -os_type: centos +# os_type: centos tasks: - install: diff --git a/qa/suites/rgw/verify/validater/valgrind.yaml b/qa/suites/rgw/verify/validater/valgrind.yaml index 66571d34d7df3..c9fbfda5d5fb7 100644 --- a/qa/suites/rgw/verify/validater/valgrind.yaml +++ b/qa/suites/rgw/verify/validater/valgrind.yaml @@ -1,5 +1,5 @@ # see http://tracker.ceph.com/issues/20360 and http://tracker.ceph.com/issues/18126 -os_type: centos +# os_type: centos overrides: install: -- 2.39.5