centos: Bump default image to CentOS Stream 10 as well

diff --git a/mkosi.conf.d/20-centos/mkosi.conf b/mkosi.conf.d/20-centos/mkosi.conf
index 504b9396f568216ecdf4be871b9ce242a7c69225..ab255a638124fd57e915794565c3697b1bb3d2e1 100644 (file)
--- a/mkosi.conf.d/20-centos/mkosi.conf
+++ b/mkosi.conf.d/20-centos/mkosi.conf
@@ -6,7 +6,7 @@ Distribution=|alma
 Distribution=|rocky
 
 [Distribution]
-Release=9
+Release=10
 
 [Content]
 # CentOS Stream 10 does not ship an unsigned shim

diff --git a/mkosi.conf.d/20-centos/mkosi.conf.d/epel.conf b/mkosi.conf.d/20-centos/mkosi.conf.d/epel.conf
index 4987272c7674201eeab9a7ef98d0ca538beac851..ab652c8d4c30f712780cf6c21a6384b3a434fc7a 100644 (file)
--- a/mkosi.conf.d/20-centos/mkosi.conf.d/epel.conf
+++ b/mkosi.conf.d/20-centos/mkosi.conf.d/epel.conf
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 [Match]
-Release=9
+Release=10
 
 [Distribution]
 Repositories=epel,epel-next
@@ -9,4 +9,3 @@ Repositories=epel,epel-next
 [Content]
 Packages=
         rpmautospec
-        rpmautospec-rpm-macros

diff --git a/tests/__init__.py b/tests/__init__.py
index 1a6341d02b27bde5953489403e576f5817d8362e..2923f5e9919e4b8369e1ed4c9c694a3ab17ee4d5 100644 (file)
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -157,9 +157,7 @@ class Image:
             check=False,
         )
 
-        rc = 0 if self.config.distribution.is_centos_variant() else 123
-
-        if result.returncode != rc:
+        if result.returncode != 123:
             raise subprocess.CalledProcessError(result.returncode, result.args, result.stdout, result.stderr)
 
         return result