Remove centos/ubuntu references

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>

diff --git a/qa/suites/rgw/hadoop-s3a/s3a-hadoop-v28.yaml b/qa/suites/rgw/hadoop-s3a/s3a-hadoop-v28.yaml
deleted file mode 100644 (file)
index 41dfa40..0000000
--- a/qa/suites/rgw/hadoop-s3a/s3a-hadoop-v28.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-os_type: centos
-os_version: "7.3"
-machine_type: vps
-overrides:
-    ceph_ansible:
-      vars:
-        ceph_conf_overrides:
-          global:
-            osd default pool size: 2
-            osd pool default pg num: 128
-            osd pool default pgp num: 128
-            debug rgw: 20 
-            debug ms: 1
-        ceph_test: true
-        ceph_dev: true
-        ceph_dev_key: https://download.ceph.com/keys/autobuild.asc
-        ceph_origin: upstream
-        journal_collocation: true
-        osd_auto_discovery: false
-        journal_size: 1024
-
-roles:
-- [mon.a, osd.0, osd.1, osd.2, rgw.0]
-- [osd.3, osd.4, osd.5]
-- [osd.6, osd.7, osd.8]
-- [mgr.x]
-tasks:
-- ssh-keys:
-- ceph-ansible:
-- s3a-hadoop:
-    hadoop-version: '2.8.0'

diff --git a/qa/suites/rgw/hadoop-s3a/s3a-hadoop.yaml b/qa/suites/rgw/hadoop-s3a/s3a-hadoop.yaml
deleted file mode 100644 (file)
index 171cc66..0000000
--- a/qa/suites/rgw/hadoop-s3a/s3a-hadoop.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-os_type: centos
-os_version: "7.3"
-machine_type: vps
-overrides:
-    ceph_ansible:
-      vars:
-        ceph_conf_overrides:
-          global:
-            osd default pool size: 2
-            osd pool default pg num: 128
-            osd pool default pgp num: 128
-            debug rgw: 20 
-            debug ms: 1
-        ceph_test: true
-        ceph_dev: true
-        ceph_dev_key: https://download.ceph.com/keys/autobuild.asc
-        ceph_origin: upstream
-        journal_collocation: true
-        osd_auto_discovery: false
-        journal_size: 1024
-roles:
-- [mon.a, osd.0, osd.1, osd.2, rgw.0]
-- [osd.3, osd.4, osd.5]
-- [osd.6, osd.7, osd.8]
-- [mgr.x]
-tasks:
-- ssh-keys:
-- ceph-ansible:
-- s3a-hadoop:

diff --git a/qa/suites/rgw/multisite/tasks/test_multi.yaml b/qa/suites/rgw/multisite/tasks/test_multi.yaml
index a8f897873def8b4dc23e98935872f0b586c2ca61..f53a0345bdb68b8df35112aefa805a8390549509 100644 (file)
--- a/qa/suites/rgw/multisite/tasks/test_multi.yaml
+++ b/qa/suites/rgw/multisite/tasks/test_multi.yaml
@@ -1,5 +1,4 @@
 # see http://tracker.ceph.com/issues/20360 and http://tracker.ceph.com/issues/18126
-os_type: centos
 
 tasks:
 - install:

diff --git a/qa/suites/rgw/multisite/valgrind.yaml b/qa/suites/rgw/multisite/valgrind.yaml
index 08fad9da02381e15955f85b1a236f55d70455a75..6c53512b24f63a035f436388713f08250059bb68 100644 (file)
--- a/qa/suites/rgw/multisite/valgrind.yaml
+++ b/qa/suites/rgw/multisite/valgrind.yaml
@@ -1,5 +1,4 @@
 # see http://tracker.ceph.com/issues/20360 and http://tracker.ceph.com/issues/18126
-os_type: centos
 
 overrides:
   install:

diff --git a/qa/suites/rgw/thrash/workload/rgw_bucket_quota.yaml b/qa/suites/rgw/thrash/workload/rgw_bucket_quota.yaml
index 32e6af59f91b3aec7c42ab1167bb908c52b2277a..ec4fc36a5a81a7636465677aa2fe40e7f8df3e64 100644 (file)
--- a/qa/suites/rgw/thrash/workload/rgw_bucket_quota.yaml
+++ b/qa/suites/rgw/thrash/workload/rgw_bucket_quota.yaml
@@ -1,5 +1,4 @@
 # Amazon/S3.pm (cpan) not available as an rpm
-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 b792336d5b5c8e1100bc2ea9ba86c2f37f686b53..f81ed072abb105de1d94ee701b9e1bfe4be409a5 100644 (file)
--- a/qa/suites/rgw/thrash/workload/rgw_multipart_upload.yaml
+++ b/qa/suites/rgw/thrash/workload/rgw_multipart_upload.yaml
@@ -1,5 +1,4 @@
 # Amazon::S3 is not available on el7
-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 0a9888276feaeae05d0ff2a981d4718ffa1ba2d7..aee5785273445911b78f51715bbb176209794c8b 100644 (file)
--- a/qa/suites/rgw/thrash/workload/rgw_user_quota.yaml
+++ b/qa/suites/rgw/thrash/workload/rgw_user_quota.yaml
@@ -1,5 +1,4 @@
 # Amazon/S3.pm (cpan) not available as an rpm
-os_type: ubuntu
 tasks:
 - workunit:
     clients:

diff --git a/qa/suites/rgw/verify/tasks/rgw_s3tests.yaml b/qa/suites/rgw/verify/tasks/rgw_s3tests.yaml
index bed9f0e1900c2894da558fc3c65c97232af74770..2e78a43239f8d15da93164f45fd3c77c739c1a77 100644 (file)
--- a/qa/suites/rgw/verify/tasks/rgw_s3tests.yaml
+++ b/qa/suites/rgw/verify/tasks/rgw_s3tests.yaml
@@ -1,5 +1,4 @@
 # see http://tracker.ceph.com/issues/20360 and http://tracker.ceph.com/issues/18126
-os_type: centos
 
 tasks:
 - install:

diff --git a/qa/suites/rgw/verify/validater/valgrind.yaml b/qa/suites/rgw/verify/validater/valgrind.yaml
index b2095b0c91db82e4c13f4ed8d4894cb478670899..c58461629945e6c84959024e0d75de2040599ac8 100644 (file)
--- a/qa/suites/rgw/verify/validater/valgrind.yaml
+++ b/qa/suites/rgw/verify/validater/valgrind.yaml
@@ -1,5 +1,4 @@
 # see http://tracker.ceph.com/issues/20360 and http://tracker.ceph.com/issues/18126
-os_type: centos
 
 overrides:
   install: