From 4a953a16d7b80d343899de39a8cf55dc761847de Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Mon, 18 Sep 2017 13:28:22 -0400 Subject: [PATCH] qa/rgw: use overrides for hadoop version instead of having two separate tasks, add v27.yaml and v28.yaml with overrides for hadoop_version Signed-off-by: Casey Bodley --- qa/suites/rgw/hadoop-s3a/% | 0 qa/suites/rgw/hadoop-s3a/hadoop/v27.yaml | 3 ++ qa/suites/rgw/hadoop-s3a/hadoop/v28.yaml | 3 ++ qa/suites/rgw/hadoop-s3a/s3a-hadoop-v28.yaml | 31 -------------------- 4 files changed, 6 insertions(+), 31 deletions(-) create mode 100644 qa/suites/rgw/hadoop-s3a/% create mode 100644 qa/suites/rgw/hadoop-s3a/hadoop/v27.yaml create mode 100644 qa/suites/rgw/hadoop-s3a/hadoop/v28.yaml delete mode 100644 qa/suites/rgw/hadoop-s3a/s3a-hadoop-v28.yaml diff --git a/qa/suites/rgw/hadoop-s3a/% b/qa/suites/rgw/hadoop-s3a/% new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/qa/suites/rgw/hadoop-s3a/hadoop/v27.yaml b/qa/suites/rgw/hadoop-s3a/hadoop/v27.yaml new file mode 100644 index 0000000000000..7fd0dcf942b31 --- /dev/null +++ b/qa/suites/rgw/hadoop-s3a/hadoop/v27.yaml @@ -0,0 +1,3 @@ +overrides: + s3a-hadoop: + hadoop-version: '2.7.3' diff --git a/qa/suites/rgw/hadoop-s3a/hadoop/v28.yaml b/qa/suites/rgw/hadoop-s3a/hadoop/v28.yaml new file mode 100644 index 0000000000000..20a06baab3934 --- /dev/null +++ b/qa/suites/rgw/hadoop-s3a/hadoop/v28.yaml @@ -0,0 +1,3 @@ +overrides: + s3a-hadoop: + hadoop-version: '2.8.0' 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 index 41dfa408ba482..0000000000000 --- 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' -- 2.39.5