From: Zack Cerza <zack@redhat.com>
Date: Tue, 26 May 2015 20:37:20 +0000 (-0600)
Subject: Bump default OS versions
X-Git-Tag: 1.1.0~928^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=672989649aac1517c6f503c661823ab71dcbe229;p=teuthology.git

Bump default OS versions

Signed-off-by: Zack Cerza <zack@redhat.com>
---

diff --git a/teuthology/misc.py b/teuthology/misc.py
index d8a5781a24..b27041e701 100644
--- a/teuthology/misc.py
+++ b/teuthology/misc.py
@@ -1192,12 +1192,12 @@ def get_distro_version(ctx):
     Get the verstion of the distro that we are using (release number).
     """
     default_os_version = dict(
-        ubuntu="12.04",
-        fedora="18",
-        centos="6.4",
+        ubuntu="14.04",
+        fedora="20",
+        centos="7.0",
         opensuse="12.2",
         sles="11-sp2",
-        rhel="6.4",
+        rhel="7.0",
         debian='7.0'
     )
     distro = get_distro(ctx)
diff --git a/teuthology/suite.py b/teuthology/suite.py
index ad33ba88c4..62a21c2940 100644
--- a/teuthology/suite.py
+++ b/teuthology/suite.py
@@ -376,7 +376,7 @@ def get_distro_defaults(distro, machine_type):
         (arch, release, pkg_type)
 
     This is used to default to:
-        ('x86_64', 'precise', 'deb') when passed 'ubuntu' and 'plana'
+        ('x86_64', 'trusty', 'deb') when passed 'ubuntu' and 'plana'
     ('armv7l', 'saucy', 'deb') when passed 'ubuntu' and 'saya'
     ('x86_64', 'wheezy', 'deb') when passed 'debian'
     ('x86_64', 'fedora20', 'rpm') when passed 'fedora'
@@ -393,7 +393,7 @@ def get_distro_defaults(distro, machine_type):
             release = 'saucy'
             arch = 'armv7l'
         else:
-            release = 'precise'
+            release = 'trusty'
     elif distro == 'debian':
         release = 'wheezy'
         pkg_type = 'deb'
diff --git a/teuthology/test/test_get_distro_version.py b/teuthology/test/test_get_distro_version.py
index fdccc84279..0a0bd7a4d8 100644
--- a/teuthology/test/test_get_distro_version.py
+++ b/teuthology/test/test_get_distro_version.py
@@ -20,7 +20,7 @@ class TestGetDistroVersion(object):
         #Default distro is ubuntu, default version of ubuntu is 12.04
         self.fake_ctx.os_version = None
         distroversion = get_distro_version(self.fake_ctx)
-        assert distroversion == '12.04'
+        assert distroversion == '14.04'
 
     def test_argument_version(self):
         self.fake_ctx.os_version = '13.04'
diff --git a/teuthology/test/test_suite.py b/teuthology/test/test_suite.py
index b7e03edbf9..f093e7d820 100644
--- a/teuthology/test/test_suite.py
+++ b/teuthology/test/test_suite.py
@@ -283,7 +283,7 @@ class TestDistroDefaults(object):
 
     def test_distro_defaults_plana(self):
         assert suite.get_distro_defaults('ubuntu', 'plana') == ('x86_64',
-                                                                'precise',
+                                                                'trusty',
                                                                 'deb')
 
     def test_distro_defaults_debian(self):