From: Zack Cerza <zack@redhat.com>
Date: Thu, 4 May 2017 21:14:58 +0000 (-0600)
Subject: Update default Ubuntu version to 16.04
X-Git-Tag: 1.1.0~424^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1071%2Fhead;p=teuthology.git

Update default Ubuntu version to 16.04

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

diff --git a/teuthology/orchestra/opsys.py b/teuthology/orchestra/opsys.py
index 3f08c5030..556a143ca 100644
--- a/teuthology/orchestra/opsys.py
+++ b/teuthology/orchestra/opsys.py
@@ -28,7 +28,7 @@ DISTRO_CODENAME_MAP = {
 }
 
 DEFAULT_OS_VERSION = dict(
-    ubuntu="14.04",
+    ubuntu="16.04",
     fedora="20",
     centos="7.0",
     opensuse="12.2",
diff --git a/teuthology/test/test_get_distro_version.py b/teuthology/test/test_get_distro_version.py
index 0a0bd7a4d..75f8154dc 100644
--- a/teuthology/test/test_get_distro_version.py
+++ b/teuthology/test/test_get_distro_version.py
@@ -17,10 +17,10 @@ class TestGetDistroVersion(object):
         self.fake_ctx_noarg.os_type = None
 
     def test_default_distro_version(self):
-        #Default distro is ubuntu, default version of ubuntu is 12.04
+        # Default distro is ubuntu, default version of ubuntu is 16.04
         self.fake_ctx.os_version = None
         distroversion = get_distro_version(self.fake_ctx)
-        assert distroversion == '14.04'
+        assert distroversion == '16.04'
 
     def test_argument_version(self):
         self.fake_ctx.os_version = '13.04'
diff --git a/teuthology/test/test_packaging.py b/teuthology/test/test_packaging.py
index dec12a12f..fdb0b37d6 100644
--- a/teuthology/test/test_packaging.py
+++ b/teuthology/test/test_packaging.py
@@ -477,7 +477,7 @@ class TestBuilderProject(object):
         ('rhel', None, None, 'centos7'),
         ('centos', None, None, 'centos7'),
         ('fedora', None, None, 'fedora20'),
-        ('ubuntu', None, None, 'trusty'),
+        ('ubuntu', None, None, 'xenial'),
         ('debian', None, None, 'wheezy'),
     ]
 
@@ -754,6 +754,6 @@ class TestShamanProject(TestBuilderProject):
         ('rhel', None, None, 'centos/7'),
         ('centos', None, None, 'centos/7'),
         ('fedora', None, None, 'fedora/20'),
-        ('ubuntu', None, None, 'ubuntu/14.04'),
+        ('ubuntu', None, None, 'ubuntu/16.04'),
         ('debian', None, None, 'debian/7.0'),
     ]