Update default OS versions

Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/teuthology/orchestra/opsys.py b/teuthology/orchestra/opsys.py
index 556a143ca77734e70ea2ea40f200c56256d520dc..46c4c427f4fb2c32d3ffd9ab522e697039b19ea0 100644 (file)
--- a/teuthology/orchestra/opsys.py
+++ b/teuthology/orchestra/opsys.py
@@ -22,19 +22,23 @@ DISTRO_CODENAME_MAP = {
         "6": "core",
     },
     "fedora": {
-        "21": "twenty one",
+        "25": "25",
+        "24": "24",
+        "23": "23",
+        "22": "22",
+        "21": "21",
         "20": "heisenbug",
     },
 }
 
 DEFAULT_OS_VERSION = dict(
     ubuntu="16.04",
-    fedora="20",
-    centos="7.0",
+    fedora="25",
+    centos="7.4",
     opensuse="12.2",
     sles="11-sp2",
-    rhel="7.0",
-    debian='7.0'
+    rhel="7.4",
+    debian='8.0'
 )
 
 

diff --git a/teuthology/test/test_packaging.py b/teuthology/test/test_packaging.py
index 9478a50d797284fcd70c686ce25fcb3f6228740a..9bcf2b011670b4ea2a52e97125e673da7963b764 100644 (file)
--- a/teuthology/test/test_packaging.py
+++ b/teuthology/test/test_packaging.py
@@ -477,9 +477,9 @@ class TestBuilderProject(object):
     DISTRO_MATRIX_NOVER = [
         ('rhel', None, None, 'centos7'),
         ('centos', None, None, 'centos7'),
-        ('fedora', None, None, 'fedora20'),
+        ('fedora', None, None, 'fedora25'),
         ('ubuntu', None, None, 'xenial'),
-        ('debian', None, None, 'wheezy'),
+        ('debian', None, None, 'jessie'),
     ]
 
     @pytest.mark.parametrize(
@@ -754,7 +754,7 @@ class TestShamanProject(TestBuilderProject):
     DISTRO_MATRIX_NOVER = [
         ('rhel', None, None, 'centos/7'),
         ('centos', None, None, 'centos/7'),
-        ('fedora', None, None, 'fedora/20'),
+        ('fedora', None, None, 'fedora/25'),
         ('ubuntu', None, None, 'ubuntu/16.04'),
-        ('debian', None, None, 'debian/7.0'),
+        ('debian', None, None, 'debian/8.0'),
     ]