Merge pull request #2137 from kshtsk/wip-rocky-9.7

orchestra: rocky 9.6 and 10.0 are gone

Author: djgalloway

teuthology/orchestra/opsys.py

@@ -36,13 +36,13 @@
     },
     "alma": {
         "8.10": "alma",
-        "9.6": "alma",
-        "10.0": "alma",
+        "9.7": "alma",
+        "10.1": "alma",
     },
     "rocky": {
         "8.10": "rocky",
-        "9.6": "rocky",
-        "10.0": "rocky",
+        "9.7": "rocky",
+        "10.1": "rocky",
     },
     "centos": {
         "10": "stream",
@@ -96,8 +96,8 @@
     opensuse="15.6",
     sle="15.2",
     rhel="8.6",
-    rocky="9.6",
-    alma="9.6",
+    rocky="9.7",
+    alma="9.7",
     debian='8.0'
 )
 

teuthology/provision/downburst.py

@@ -322,8 +322,8 @@ def __del__(self):
                  '16.0(leap)',
         ],
     'sles': ['12-sp3', '15-sp1', '15-sp2'],
-    'alma': ['10.0', '8.10', '9.6'],
-    'rocky': ['10.0', '8.10', '9.6'],
+    'alma': ['10.1', '8.10', '9.7'],
+    'rocky': ['10.1', '8.10', '9.7'],
     'ubuntu': ['20.04(focal)', '20.10(groovy)',
                '21.04(hirsute)', '21.10(impish)',
                '22.04(jammy)', '22.10(kinetic)',

teuthology/test/test_packaging.py

@@ -768,9 +768,9 @@ def test_build_complete_success(self):
 
     DISTRO_MATRIX = [
         ('rhel', '7.0', None, 'centos/7'),
-        ('alma', '9.6', None, 'alma/9'),
-        ('rocky', '9.6', None, 'rocky/9'),
-        ('rocky', '10.0', None, 'rocky/10'),
+        ('alma', '9.7', None, 'alma/9'),
+        ('rocky', '9.7', None, 'rocky/9'),
+        ('rocky', '10.1', None, 'rocky/10'),
         ('centos', '6.5', None, 'centos/6'),
         ('centos', '7.0', None, 'centos/7'),
         ('centos', '7.1', None, 'centos/7'),