From: Dan Mick <dan.mick@redhat.com>
Date: Wed, 26 Oct 2016 04:23:09 +0000 (-0700)
Subject: Remove obsolete calamari code
X-Git-Tag: v11.1.1~58^2^2~65^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=e24d3e00e86725fc34a718adb4823f0d49d5f6f0;p=ceph-ci.git

Remove obsolete calamari code

It's dead, Jim.

Fixes: http://tracker.ceph.com/issues/10235
Signed-off-by: Dan Mick <dan.mick@redhat.com>
---

diff --git a/suites/calamari/% b/suites/calamari/%
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/suites/calamari/clusters/osd-3.yaml b/suites/calamari/clusters/osd-3.yaml
deleted file mode 100644
index 66f4fe59850..00000000000
--- a/suites/calamari/clusters/osd-3.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644
index 2240054be17..00000000000
--- a/suites/calamari/distros/centos6.4.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-os_type: centos
-os_version: '6.4'
diff --git a/suites/calamari/distros/centos6.5.yaml b/suites/calamari/distros/centos6.5.yaml
deleted file mode 100644
index e2ee6b36f2e..00000000000
--- a/suites/calamari/distros/centos6.5.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-os_type: centos
-os_version: '6.5'
diff --git a/suites/calamari/distros/precise.yaml b/suites/calamari/distros/precise.yaml
deleted file mode 100644
index 7aaa31b660c..00000000000
--- a/suites/calamari/distros/precise.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-os_type: ubuntu
-os_version: precise
diff --git a/suites/calamari/distros/rhel6.4.yaml b/suites/calamari/distros/rhel6.4.yaml
deleted file mode 100644
index 72dd4d13109..00000000000
--- a/suites/calamari/distros/rhel6.4.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-os_type: rhel
-os_version: '6.4'
diff --git a/suites/calamari/distros/rhel6.5.yaml b/suites/calamari/distros/rhel6.5.yaml
deleted file mode 100644
index 4294d98d6f3..00000000000
--- a/suites/calamari/distros/rhel6.5.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-os_type: rhel
-os_version: '6.5'
diff --git a/suites/calamari/distros/rhel7.0.yaml b/suites/calamari/distros/rhel7.0.yaml
deleted file mode 100644
index 1571f9477ad..00000000000
--- a/suites/calamari/distros/rhel7.0.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-os_type: rhel
-os_version: '7.0'
diff --git a/suites/calamari/distros/trusty.yaml b/suites/calamari/distros/trusty.yaml
deleted file mode 100644
index cef9fd0037e..00000000000
--- a/suites/calamari/distros/trusty.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-os_type: ubuntu
-os_version: trusty
diff --git a/suites/calamari/distros/wheezy.yaml.disabled b/suites/calamari/distros/wheezy.yaml.disabled
deleted file mode 100644
index 47c54de4649..00000000000
--- a/suites/calamari/distros/wheezy.yaml.disabled
+++ /dev/null
@@ -1,2 +0,0 @@
-os_type: debian
-os_version: '7.0'
diff --git a/suites/calamari/tasks/calamari.yaml b/suites/calamari/tasks/calamari.yaml
deleted file mode 100644
index 70e1129a032..00000000000
--- a/suites/calamari/tasks/calamari.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-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