From: Sage Weil <sage@redhat.com>
Date: Wed, 30 Nov 2016 16:00:39 +0000 (-0500)
Subject: rados: avoid ubuntu xenial on upgrade tests
X-Git-Tag: v10.2.6~165^2^2~9^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f95ed3e7f120d4b35d93c875aa24ef75fa651d0e;p=ceph.git

rados: avoid ubuntu xenial on upgrade tests

Not all of the older package builds are present for xenial.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/suites/rados/singleton-nomsgr/all/11429.yaml b/suites/rados/singleton-nomsgr/all/11429.yaml
index e6808b2a003f..bdcdd556c50f 100644
--- a/suites/rados/singleton-nomsgr/all/11429.yaml
+++ b/suites/rados/singleton-nomsgr/all/11429.yaml
@@ -1,6 +1,7 @@
 # we don't have el7 packages for old releases
 # http://tracker.ceph.com/issues/15139
 os_type: ubuntu
+os_version: trusty
 overrides:
   ceph:
     conf:
diff --git a/suites/rados/singleton-nomsgr/all/13234.yaml b/suites/rados/singleton-nomsgr/all/13234.yaml
index a4d7829cbc57..5f7106e82a92 100644
--- a/suites/rados/singleton-nomsgr/all/13234.yaml
+++ b/suites/rados/singleton-nomsgr/all/13234.yaml
@@ -1,6 +1,7 @@
 # we don't have el7 packages for old releases
 # http://tracker.ceph.com/issues/15139
 os_type: ubuntu
+os_version: trusty
 overrides:
   ceph:
     conf:
diff --git a/suites/rados/singleton-nomsgr/all/16113.yaml b/suites/rados/singleton-nomsgr/all/16113.yaml
index 6114103117ee..4fe1bc1fd6e6 100644
--- a/suites/rados/singleton-nomsgr/all/16113.yaml
+++ b/suites/rados/singleton-nomsgr/all/16113.yaml
@@ -1,4 +1,5 @@
 os_type: ubuntu
+os_version: trusty
 overrides:
   ceph:
     conf:
diff --git a/suites/rados/singleton-nomsgr/all/lfn-upgrade-hammer.yaml b/suites/rados/singleton-nomsgr/all/lfn-upgrade-hammer.yaml
index 481a22754f74..43668bddb774 100644
--- a/suites/rados/singleton-nomsgr/all/lfn-upgrade-hammer.yaml
+++ b/suites/rados/singleton-nomsgr/all/lfn-upgrade-hammer.yaml
@@ -1,4 +1,5 @@
 os_type: ubuntu
+os_version: trusty
 overrides:
   ceph:
     conf:
diff --git a/suites/rados/singleton-nomsgr/all/lfn-upgrade-infernalis.yaml b/suites/rados/singleton-nomsgr/all/lfn-upgrade-infernalis.yaml
index 55f04c37bd6d..8a58a18470ee 100644
--- a/suites/rados/singleton-nomsgr/all/lfn-upgrade-infernalis.yaml
+++ b/suites/rados/singleton-nomsgr/all/lfn-upgrade-infernalis.yaml
@@ -1,4 +1,5 @@
 os_type: ubuntu
+os_version: trusty
 overrides:
   ceph:
     conf:
diff --git a/suites/rados/singleton/all/ec-lost-unfound-upgrade.yaml b/suites/rados/singleton/all/ec-lost-unfound-upgrade.yaml
index 8c912729fdb3..9228b30568b3 100644
--- a/suites/rados/singleton/all/ec-lost-unfound-upgrade.yaml
+++ b/suites/rados/singleton/all/ec-lost-unfound-upgrade.yaml
@@ -1,3 +1,4 @@
+os_type: centos
 roles:
 - - mon.a
   - mon.b
diff --git a/suites/rados/singleton/all/lost-unfound-delete-upgrade.yaml b/suites/rados/singleton/all/lost-unfound-delete-upgrade.yaml
index 9bd9e19d3b59..61ef7d8cc80d 100644
--- a/suites/rados/singleton/all/lost-unfound-delete-upgrade.yaml
+++ b/suites/rados/singleton/all/lost-unfound-delete-upgrade.yaml
@@ -1,3 +1,4 @@
+os_type: centos
 roles:
 - - mon.a
   - mon.b
diff --git a/suites/rados/singleton/all/lost-unfound-upgrade.yaml b/suites/rados/singleton/all/lost-unfound-upgrade.yaml
index 0a8dd69ffe8c..0040071e51ea 100644
--- a/suites/rados/singleton/all/lost-unfound-upgrade.yaml
+++ b/suites/rados/singleton/all/lost-unfound-upgrade.yaml
@@ -1,3 +1,4 @@
+os_type: centos
 roles:
 - - mon.a
   - mon.b
diff --git a/suites/rados/upgrade/hammer-x-singleton/2-partial-upgrade/firsthalf.yaml b/suites/rados/upgrade/hammer-x-singleton/2-partial-upgrade/firsthalf.yaml
index 2490f76d6389..cd0414d016b4 100644
--- a/suites/rados/upgrade/hammer-x-singleton/2-partial-upgrade/firsthalf.yaml
+++ b/suites/rados/upgrade/hammer-x-singleton/2-partial-upgrade/firsthalf.yaml
@@ -1,3 +1,4 @@
+os_type: centos
 tasks:
 - install.upgrade:
     osd.0: