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 3f08c5030cbb53cf86531dca0296d44234593d90..556a143ca77734e70ea2ea40f200c56256d520dc 100644 (file)
--- 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 0a0bd7a4d8747ff6aa5133292f8a60490dae7b16..75f8154dcf680608ada000ab7b13be64108eed3f 100644 (file)
--- 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 dec12a12f2bb6503a9a74b8977ab9292051d5792..fdb0b37d639948e0bc6a44882695cb627d33b189 100644 (file)
--- 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'),
     ]