Fix tests to pass in RHEL-9.2 gating

Resolves: rhbz#2132250
Signed-off-by: Tomáš Hozza <thozza@redhat.com>

osbuild-composer.spec

@@ -22,7 +22,7 @@ It is compatible with composer-cli and cockpit-composer clients.
 }
 
 Name:           osbuild-composer
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An image building service based on osbuild
 
 # osbuild-composer doesn't have support for building i686 and armv7hl images
@@ -33,6 +33,7 @@ License:        ASL 2.0
 URL:            %{gourl}
 Source0:        %{gosource}
 
+Patch0:         tools-provision.sh-copy-RHEL-repo-overrides-using-wi.patch
 
 BuildRequires:  %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
 BuildRequires:  systemd
@@ -427,6 +428,9 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
 %endif
 
 %changelog
+* Thu Nov 03 2022 Tomas Hozza <thozza@redhat.com> - 67-2
+- Fix functional tests to make them pass in RHEL-9.2 gating
+
 * Wed Nov 02 2022 imagebuilder-bots+imagebuilder-bot@redhat.com <imagebuilder-bot> - 67-1
 - New upstream release
 

tools-provision.sh-copy-RHEL-repo-overrides-using-wi.patch

@@ -0,0 +1,38 @@
+From 1e5a7526369ec0bfd4bd5c536ff16f534f023fd5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hozza?= <thozza@redhat.com>
+Date: Wed, 2 Nov 2022 12:18:46 +0100
+Subject: [PATCH] tools/provision.sh: copy RHEL repo overrides using wildcard
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Don't list specific RHEL repos which should be copied over to the repo
+overrides directory, but instead copy all of them, similar to how it's
+done for Fedora and CentOS Stream. This is less error prone when support
+for a new RHEL release is added to composer.
+
+Signed-off-by: Tomáš Hozza <thozza@redhat.com>
+---
+ tools/provision.sh | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/tools/provision.sh b/tools/provision.sh
+index 93f8cccbd..09265f907 100755
+--- a/tools/provision.sh
++++ b/tools/provision.sh
+@@ -140,11 +140,7 @@ else # AUTH_METHOD_NONE
+     # Copy all fedora repo overrides
+     sudo cp -a /usr/share/tests/osbuild-composer/repositories/{fedora,centos}-*.json "$REPODIR"
+     # Copy RHEL point release repos
+-    sudo cp /usr/share/tests/osbuild-composer/repositories/rhel-85.json "$REPODIR"
+-    sudo cp /usr/share/tests/osbuild-composer/repositories/rhel-86.json "$REPODIR"
+-    sudo cp /usr/share/tests/osbuild-composer/repositories/rhel-87.json "$REPODIR"
+-    sudo cp /usr/share/tests/osbuild-composer/repositories/rhel-90.json "$REPODIR"
+-    sudo cp /usr/share/tests/osbuild-composer/repositories/rhel-91.json "$REPODIR"
++    sudo cp -a /usr/share/tests/osbuild-composer/repositories/rhel-*.json "$REPODIR"
+ 
+     # override source repositories to consume content from the nightly compose
+     if [ "${NIGHTLY:=false}" == "true" ]; then
+-- 
+2.37.3
+