update default OS versions

centos/rhel 7.4 -> 7.6
ubuntu 16.04 -> 18.04

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/teuthology/orchestra/opsys.py b/teuthology/orchestra/opsys.py
index c67d6531c093a5a6962c93eb14dd224163a260fb..57dabd47b002997fe1eca711ade512f021561465 100644 (file)
--- a/teuthology/orchestra/opsys.py
+++ b/teuthology/orchestra/opsys.py
@@ -55,12 +55,12 @@ DISTRO_CODENAME_MAP = {
 }
 
 DEFAULT_OS_VERSION = dict(
-    ubuntu="16.04",
+    ubuntu="18.04",
     fedora="25",
-    centos="7.4",
+    centos="7.6",
     opensuse="42.1",
     sle="12.3",
-    rhel="7.4",
+    rhel="7.6",
     debian='8.0'
 )
 

diff --git a/teuthology/test/test_get_distro_version.py b/teuthology/test/test_get_distro_version.py
index 75f8154dcf680608ada000ab7b13be64108eed3f..4b660939599888cd84b65cd419def50e6ec568ca 100644 (file)
--- 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 16.04
         self.fake_ctx.os_version = None
         distroversion = get_distro_version(self.fake_ctx)
-        assert distroversion == '16.04'
+        assert distroversion == '18.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 83e92e106358bb62ed879dbbf4b9f3ff4d1b6b25..dbca46dcac758e4db8c36c111a58838d1e434a51 100644 (file)
--- a/teuthology/test/test_packaging.py
+++ b/teuthology/test/test_packaging.py
@@ -417,7 +417,7 @@ class TestBuilderProject(object):
     def test_choose_reference(self, ref, tag, branch, sha1, expected):
         config = dict(
             os_type='ubuntu',
-            os_version='16.04',
+            os_version='18.04',
         )
         if ref:
             config['ref'] = ref
@@ -478,7 +478,7 @@ class TestBuilderProject(object):
         ('rhel', None, None, 'centos7'),
         ('centos', None, None, 'centos7'),
         ('fedora', None, None, 'fedora25'),
-        ('ubuntu', None, None, 'xenial'),
+        ('ubuntu', None, None, 'bionic'),
         ('debian', None, None, 'jessie'),
     ]
 
@@ -755,6 +755,6 @@ class TestShamanProject(TestBuilderProject):
         ('rhel', None, None, 'centos/7'),
         ('centos', None, None, 'centos/7'),
         ('fedora', None, None, 'fedora/25'),
-        ('ubuntu', None, None, 'ubuntu/16.04'),
+        ('ubuntu', None, None, 'ubuntu/18.04'),
         ('debian', None, None, 'debian/8.0'),
     ]