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 8aec750..a038189 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 @@ -330,9 +330,12 @@ fi %{pkgdir}/solver.json %changelog -* Sat Mar 29 2025 Eduard Abdullin - 144-1.alma.1 +* Wed Apr 23 2025 Eduard Abdullin - 147-1.alma.1 - Add AlmaLinux runners +* 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 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 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}"