osbuild-composer/tools-provision.sh-copy-RHEL-repo-overrides-using-wi.patch
imagebuilder-bots+imagebuilder-bot@redhat.com 49ee453bde
Fix tests to pass in RHEL-9.2 gating
Resolves: rhbz#2132250
Signed-off-by: Tomáš Hozza <thozza@redhat.com>
2022-11-03 11:16:18 +01:00

39 lines
1.7 KiB
Diff

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