From: David Galloway <dgallowa@redhat.com>
Date: Wed, 7 Jul 2021 14:22:55 +0000 (-0400)
Subject: tests: Update latest distro versions
X-Git-Tag: 1.2.0~249^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1654%2Fhead;p=teuthology.git

tests: Update latest distro versions

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

diff --git a/teuthology/test/test_get_distro_version.py b/teuthology/test/test_get_distro_version.py
index 39e89195c..3adde9289 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 16.04
+        # Default distro is ubuntu, default version of ubuntu is 20.04
         self.fake_ctx.os_version = None
         distroversion = get_distro_version(self.fake_ctx)
-        assert distroversion == '18.04'
+        assert distroversion == '20.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 ff2a8b5e1..6af094009 100644
--- a/teuthology/test/test_packaging.py
+++ b/teuthology/test/test_packaging.py
@@ -478,7 +478,7 @@ class TestBuilderProject(object):
         ('rhel', None, None, 'centos8'),
         ('centos', None, None, 'centos8'),
         ('fedora', None, None, 'fedora25'),
-        ('ubuntu', None, None, 'bionic'),
+        ('ubuntu', None, None, 'focal'),
         ('debian', None, None, 'jessie'),
     ]
 
@@ -508,6 +508,9 @@ class TestBuilderProject(object):
         ('debian', '7.1', None, 'debian'),
         ('ubuntu', '12.04', None, 'ubuntu'),
         ('ubuntu', '14.04', None, 'ubuntu'),
+        ('ubuntu', '16.04', None, 'ubuntu'),
+        ('ubuntu', '18.04', None, 'ubuntu'),
+        ('ubuntu', '20.04', None, 'ubuntu'),
     ]
 
     @pytest.mark.parametrize(
@@ -612,6 +615,9 @@ class TestGitbuilderProject(TestBuilderProject):
         ('debian', '7.1', None, 'wheezy'),
         ('ubuntu', '12.04', None, 'precise'),
         ('ubuntu', '14.04', None, 'trusty'),
+        ('ubuntu', '16.04', None, 'xenial'),
+        ('ubuntu', '18.04', None, 'bionic'),
+        ('ubuntu', '20.04', None, 'focal'),
     ]
 
 
@@ -752,12 +758,15 @@ class TestShamanProject(TestBuilderProject):
         ('debian', '7.1', None, 'debian/7.1'),
         ('ubuntu', '12.04', None, 'ubuntu/12.04'),
         ('ubuntu', '14.04', None, 'ubuntu/14.04'),
+        ('ubuntu', '16.04', None, 'ubuntu/16.04'),
+        ('ubuntu', '18.04', None, 'ubuntu/18.04'),
+        ('ubuntu', '20.04', None, 'ubuntu/20.04'),
     ]
 
     DISTRO_MATRIX_NOVER = [
         ('rhel', None, None, 'centos/8'),
         ('centos', None, None, 'centos/8'),
         ('fedora', None, None, 'fedora/25'),
-        ('ubuntu', None, None, 'ubuntu/18.04'),
+        ('ubuntu', None, None, 'ubuntu/20.04'),
         ('debian', None, None, 'debian/8.0'),
     ]