From eb27aa4849617f5109dcd0ff24aad3600b0da3fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hozza?= Date: Mon, 7 Apr 2025 14:13:40 +0200 Subject: [PATCH 1/3] Test: allow erasing packages when installing build deps MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It became a common thing that the SUT has newer selinux-policy installed than the version available in the configured repositories. osbuild has a build dependency on selinux-policy-devel, which installation fails in such case (there is no `*-devel` package with of the installed version available in the configured repositories). None of the other workarounds actually work consistently, so fall back to allowing DNF to downgrade the installed selinux-policy on SUT. Signed-off-by: Tomáš Hozza --- tests/unit-tests/prep-host-environment.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/unit-tests/prep-host-environment.sh b/tests/unit-tests/prep-host-environment.sh index 918063c..8959363 100755 --- a/tests/unit-tests/prep-host-environment.sh +++ b/tests/unit-tests/prep-host-environment.sh @@ -17,7 +17,10 @@ sudo dnf install -y \ python3-pip \ rpm-ostree \ dosfstools -sudo dnf builddep -y osbuild.spec + +# Allow erasing, since the SUT sometimes has a newer selinux-policy installed than the one available +# in the host repos, which makes the installation of selinux-policy-devel fail. +sudo dnf builddep -y --allowerasing --nobest osbuild.spec # Install pytst from pip, because the version in some RHEL / CentOS releases is too old sudo pip3 install pytest From 65b154355a8b3c0d8b924d20fcd020733ea2581d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hozza?= Date: Mon, 7 Apr 2025 14:14:37 +0200 Subject: [PATCH 2/3] Test/unit-tests: handle dot releases when parsing Source0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Tomáš Hozza --- tests/unit-tests/run-unit-tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit-tests/run-unit-tests.sh b/tests/unit-tests/run-unit-tests.sh index a899790..7d7c4bb 100755 --- a/tests/unit-tests/run-unit-tests.sh +++ b/tests/unit-tests/run-unit-tests.sh @@ -57,7 +57,7 @@ fi cd "${TMT_SOURCE_DIR}" # Extract the Source0 basename without extension -SRC_DIR=$(spectool --source 0 osbuild.spec | sed 's/.\+\(osbuild-[0-9]\+\)\.tar\.gz/\1/') +SRC_DIR=$(spectool --source 0 osbuild.spec | sed -E 's|.*/([^/]*)\.tar\.gz$|\1|') # Move to the extracted sources directory (patches are applied by default) cd "${SRC_DIR}" From 47afffc6a0d1cfd2f0090d2da5c21f8bb6e48698 Mon Sep 17 00:00:00 2001 From: imagebuilder-bot Date: Wed, 16 Apr 2025 18:03:57 +0000 Subject: [PATCH 3/3] Update to 147 Resolves: RHEL-74263 --- .gitignore | 1 + osbuild.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d8846f0..e425b2a 100644 --- a/.gitignore +++ b/.gitignore @@ -124,3 +124,4 @@ /osbuild-141.tar.gz /osbuild-142.tar.gz /osbuild-144.tar.gz +/osbuild-147.tar.gz diff --git a/osbuild.spec b/osbuild.spec index 7c165cc..4acd16c 100644 --- a/osbuild.spec +++ b/osbuild.spec @@ -1,7 +1,7 @@ %global forgeurl https://github.com/osbuild/osbuild %global selinuxtype targeted -Version: 144 +Version: 147 %forgemeta @@ -325,6 +325,9 @@ fi %{pkgdir}/solver.json %changelog +* Wed Apr 16 2025 imagebuilder-bot - 147-1 +- New upstream release + * Fri Mar 28 2025 imagebuilder-bot - 144-1 - New upstream release diff --git a/sources b/sources index 07de16c..7f5002a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osbuild-144.tar.gz) = 3f65a7ead94ce8a1a237673c3e2a2627a7db247fdc8989f952a820e0f49cd43cba3c772d71530c171b90884ab4643c3911027203c306cb110deb9678dcedbcc9 +SHA512 (osbuild-147.tar.gz) = 0a40939ebc088137512e48a6c32937513a602e6c8444d763e0f1b1e000c50256a3b526d05e781b3a930f0e24336a9489fe4f6767c7406a2494fec05a56f81710