From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 17 Jan 2025 13:05:08 +0000 (+0100)
Subject: centos: Bump default image to CentOS Stream 10 as well
X-Git-Tag: v25~41^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4707ad5afcd224bb5b1c6792ff9d6b9281ed589;p=thirdparty%2Fmkosi.git

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 504b9396f..ab255a638 100644
--- 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 4987272c7..ab652c8d4 100644
--- 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 1a6341d02..2923f5e99 100644
--- 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