From: David Galloway <dgallowa@redhat.com>
Date: Thu, 9 Jul 2020 15:30:16 +0000 (-0400)
Subject: suite/util.py: Update Ubuntu default to Xenial
X-Git-Tag: 1.1.0~66^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1534%2Fhead;p=teuthology.git

suite/util.py: Update Ubuntu default to Xenial

This will need to change to Bionic when we stop supporting luminous or must test Octopus.

Signed-off-by: David Galloway <dgallowa@redhat.com>
---

diff --git a/teuthology/suite/test/test_util.py b/teuthology/suite/test/test_util.py
index e4a811b61..395860efb 100644
--- a/teuthology/suite/test/test_util.py
+++ b/teuthology/suite/test/test_util.py
@@ -313,8 +313,8 @@ class TestDistroDefaults(object):
         assert util.get_distro_defaults('ubuntu', 'saya') == expected
 
     def test_distro_defaults_plana(self):
-        expected = ('x86_64', 'trusty',
-                    OS(name='ubuntu', version='14.04', codename='trusty'))
+        expected = ('x86_64', 'xenial',
+                    OS(name='ubuntu', version='16.04', codename='xenial'))
         assert util.get_distro_defaults('ubuntu', 'plana') == expected
 
     def test_distro_defaults_debian(self):
diff --git a/teuthology/suite/util.py b/teuthology/suite/util.py
index f5803af50..90d664890 100644
--- a/teuthology/suite/util.py
+++ b/teuthology/suite/util.py
@@ -140,7 +140,7 @@ def get_distro_defaults(distro, machine_type):
             os_version = '13.10'
             arch = 'armv7l'
         else:
-            os_version = '14.04'
+            os_version = '16.04'
     elif distro == 'debian':
         os_type = distro
         os_version = '7'