From: Dan Mick Date: Wed, 22 Oct 2014 00:27:32 +0000 (-0700) Subject: Add calamari suite definitions. X-Git-Tag: v0.94.10~27^2^2~215^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=25ae69f1d84560835064bc8f42c7d356d76a35ed;p=ceph.git Add calamari suite definitions. Notes: - very simple cluster configuration - selects vps in the actual suite config files - wheezy is currently disabled Signed-off-by: Dan Mick --- diff --git a/suites/calamari/% b/suites/calamari/% new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/suites/calamari/clusters/osd-3.yaml b/suites/calamari/clusters/osd-3.yaml new file mode 100644 index 000000000000..66f4fe598507 --- /dev/null +++ b/suites/calamari/clusters/osd-3.yaml @@ -0,0 +1,5 @@ +roles: +- [client.0] +- [mon.0, osd.0] +- [osd.1] +- [osd.2] diff --git a/suites/calamari/distros/centos6.4.yaml b/suites/calamari/distros/centos6.4.yaml new file mode 100644 index 000000000000..2240054be176 --- /dev/null +++ b/suites/calamari/distros/centos6.4.yaml @@ -0,0 +1,2 @@ +os_type: centos +os_version: '6.4' diff --git a/suites/calamari/distros/centos6.5.yaml b/suites/calamari/distros/centos6.5.yaml new file mode 100644 index 000000000000..e2ee6b36f2ee --- /dev/null +++ b/suites/calamari/distros/centos6.5.yaml @@ -0,0 +1,2 @@ +os_type: centos +os_version: '6.5' diff --git a/suites/calamari/distros/precise.yaml b/suites/calamari/distros/precise.yaml new file mode 100644 index 000000000000..7aaa31b660c7 --- /dev/null +++ b/suites/calamari/distros/precise.yaml @@ -0,0 +1,2 @@ +os_type: ubuntu +os_version: precise diff --git a/suites/calamari/distros/rhel6.4.yaml b/suites/calamari/distros/rhel6.4.yaml new file mode 100644 index 000000000000..72dd4d13109c --- /dev/null +++ b/suites/calamari/distros/rhel6.4.yaml @@ -0,0 +1,2 @@ +os_type: rhel +os_version: '6.4' diff --git a/suites/calamari/distros/rhel6.5.yaml b/suites/calamari/distros/rhel6.5.yaml new file mode 100644 index 000000000000..4294d98d6f3e --- /dev/null +++ b/suites/calamari/distros/rhel6.5.yaml @@ -0,0 +1,2 @@ +os_type: rhel +os_version: '6.5' diff --git a/suites/calamari/distros/rhel7.0.yaml b/suites/calamari/distros/rhel7.0.yaml new file mode 100644 index 000000000000..1571f9477ade --- /dev/null +++ b/suites/calamari/distros/rhel7.0.yaml @@ -0,0 +1,2 @@ +os_type: rhel +os_version: '7.0' diff --git a/suites/calamari/distros/trusty.yaml b/suites/calamari/distros/trusty.yaml new file mode 100644 index 000000000000..cef9fd0037ef --- /dev/null +++ b/suites/calamari/distros/trusty.yaml @@ -0,0 +1,2 @@ +os_type: ubuntu +os_version: trusty diff --git a/suites/calamari/distros/wheezy.yaml.disabled b/suites/calamari/distros/wheezy.yaml.disabled new file mode 100644 index 000000000000..47c54de4649a --- /dev/null +++ b/suites/calamari/distros/wheezy.yaml.disabled @@ -0,0 +1,2 @@ +os_type: debian +os_version: '7.0' diff --git a/suites/calamari/tasks/calamari.yaml b/suites/calamari/tasks/calamari.yaml new file mode 100644 index 000000000000..70e1129a0320 --- /dev/null +++ b/suites/calamari/tasks/calamari.yaml @@ -0,0 +1,10 @@ +machine_type: vps + +tasks: +- ssh_keys: +- calamari_setup: + iceball_location: http://download.inktank.com/enterprise-testing + ice_version: 1.2.2 + email: calamari@inktank.com +- calamari_nosetests: + calamari_branch: wip-testing-1.2.2