New upstream release + bachport upstream fix to make tests pass on el10

Resolves: RHEL-32133
Signed-off-by: Tomáš Hozza <thozza@redhat.com>

.gitignore

@@ -92,3 +92,4 @@
 /osbuild-composer-100.tar.gz
 /osbuild-composer-106.tar.gz
 /osbuild-composer-108.tar.gz
+/osbuild-composer-109.tar.gz

PR-4186.patch

@@ -0,0 +1,44 @@
+From 1cc7757f85010539170ff99c5c6f00c75918a8ca Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hozza?= <thozza@redhat.com>
+Date: Tue, 4 Jun 2024 14:52:05 +0200
+Subject: [PATCH] Tools/provision.sh: adjust conditional EPEL installation for
+ el10
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+EPEL-10 can't be installed on any of c10s and el10. Previously, the
+script would try to install EPEL repositories package on el10 and fail.
+
+In addition, use our "workaround" repository with c10s builds of some
+packages (such as koji) also on el10.
+
+Signed-off-by: Tomáš Hozza <thozza@redhat.com>
+---
+ tools/provision.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tools/provision.sh b/tools/provision.sh
+index 1c6eca8de..bab30fc99 100755
+--- a/tools/provision.sh
++++ b/tools/provision.sh
+@@ -31,14 +31,14 @@ fi
+ # and install koji and ansible here.
+ #
+ # TODO: Adjust the c10s condition, once EPEL-10 is available.
+-if [[ $ID == rhel || ($ID == centos && ${VERSION_ID%.*} -lt 10) ]] && ! rpm -q epel-release; then
++if [[ ($ID == rhel || $ID == centos) && ${VERSION_ID%.*} -lt 10 ]] && ! rpm -q epel-release; then
+     curl -Ls --retry 5 --output /tmp/epel.rpm \
+         https://dl.fedoraproject.org/pub/epel/epel-release-latest-"${VERSION_ID%.*}".noarch.rpm
+     sudo rpm -Uvh /tmp/epel.rpm
+ fi
+ 
+ # TODO: Remove this workaround, once koji is in EPEL-10
+-if [[ $ID == centos && ${VERSION_ID%.*} == 10 ]]; then
++if [[ ($ID == rhel || $ID == centos) && ${VERSION_ID%.*} == 10 ]]; then
+     sudo dnf copr enable -y @osbuild/centpkg "centos-stream-10-$(uname -m)"
+ fi
+ 
+-- 
+2.45.1
+

osbuild-composer.spec

@@ -12,7 +12,7 @@
 
 %global goipath         github.com/osbuild/osbuild-composer
 
-Version:        108
+Version:        109
 
 %gometa
 
@@ -25,7 +25,7 @@ It is compatible with composer-cli and cockpit-composer clients.
 }
 
 Name:           osbuild-composer
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        An image building service based on osbuild
 
 # osbuild-composer doesn't have support for building i686 and armv7hl images
@@ -38,6 +38,8 @@ Source0:        %{gosource}
 
 # https://github.com/osbuild/osbuild-composer/pull/4179
 Patch0:         PR-4179.patch
+# https://github.com/osbuild/osbuild-composer/pull/4186
+Patch1:         PR-4186.patch
 
 BuildRequires:  %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
 BuildRequires:  systemd
@@ -447,6 +449,9 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
 %endif
 
 %changelog
+* Tue Jun 04 2024 Tomáš Hozza <thozza@redhat.com> - 109-1
+- New upstream release + bachport upstream fix to make tests pass on el10
+
 * Fri May 31 2024 Tomáš Hozza <thozza@redhat.com> - 108-2
 - Bachport upstream fixes to make tests pass
 

sources

@@ -1 +1 @@
-SHA512 (osbuild-composer-108.tar.gz) = ce73065e31e3e966fc2b68075c526e764faae8dc11e5f0005f7d63b8e0124e443750c1f7e931ec0b78e6bb315dfdf9488326ddb49c6935990056e6b28cdf8a0d
+SHA512 (osbuild-composer-109.tar.gz) = 0c84cda4265fc5e77cc1906ce0d2fbded32061abcfd00cafab301e7c9edce75b031facabf2f301e6b57ab695168626d9e1651aae10929584fabc66734f3edd56