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 e6808b2a003f745847fcc0adca47c22b60e25790..bdcdd556c50fba77090225cdb494790d949f64c6 100644 (file)
--- 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 a4d7829cbc57c71eb2460928140363961c0b3955..5f7106e82a928536b72ed2b8b9bc48ed485fb8e0 100644 (file)
--- 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 6114103117ee39884a59f074c8ad57dbf41443a1..4fe1bc1fd6e6349b667f775a6d0d286378d712e6 100644 (file)
--- 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 481a22754f741183c389ba29b8e12d8ecb2be931..43668bddb7743db238994f7f60475571baa11f81 100644 (file)
--- 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 55f04c37bd6d0b83b5318ecf0a46a2c84bcc2bcd..8a58a18470eec4cb057e98d1787c6a8302abae71 100644 (file)
--- 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 8c912729fdb3c6b0bfbd16ad64f950712f7c8638..9228b30568b34e2ec3321baed56a71a72913f025 100644 (file)
--- 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 9bd9e19d3b59b7ff2764e4dd8a23286a742d48c0..61ef7d8cc80d14e65605e5b0ed51b3910c50440f 100644 (file)
--- 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 0a8dd69ffe8c4aa28f5383ab9959611cff151d73..0040071e51ea08ebe763aef8696bedd36ffd492e 100644 (file)
--- 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 2490f76d6389d50fe5cc0c2637a4cdb8929129e3..cd0414d016b4e6837b22023bd5a57bd5591ef8a5 100644 (file)
--- 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: