Merge pull request ceph#1785 from ceph/jammy

opsys.py: Make Ubuntu 22.04 default
amathuria · Aug 16, 2022 · b1d387f · b1d387f
2 parents 9e7483c + 056e27a
commit b1d387f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/teuthology/orchestra/opsys.py b/teuthology/orchestra/opsys.py
@@ -62,7 +62,7 @@
 }
 
 DEFAULT_OS_VERSION = dict(
-    ubuntu="20.04",
+    ubuntu="22.04",
     fedora="25",
     centos="8.stream",
     opensuse="15.0",

diff --git a/teuthology/test/test_get_distro_version.py b/teuthology/test/test_get_distro_version.py
@@ -20,7 +20,7 @@ def test_default_distro_version(self):
         # 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 == '20.04'
+        assert distroversion == '22.04'
 
     def test_argument_version(self):
         self.fake_ctx.os_version = '13.04'