forked from rpms/osbuild-composer
Update to 102
Resolves: RHEL-27178
This commit is contained in:
parent
6da3a3e086
commit
bfc228d96d
1
.gitignore
vendored
1
.gitignore
vendored
@ -73,3 +73,4 @@
|
||||
/osbuild-composer-99.tar.gz
|
||||
/osbuild-composer-100.tar.gz
|
||||
/osbuild-composer-101.tar.gz
|
||||
/osbuild-composer-102.tar.gz
|
||||
|
@ -12,7 +12,7 @@
|
||||
|
||||
%global goipath github.com/osbuild/osbuild-composer
|
||||
|
||||
Version: 101
|
||||
Version: 102
|
||||
|
||||
%gometa
|
||||
|
||||
@ -422,6 +422,9 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Wed Mar 06 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 102-1
|
||||
- New upstream release
|
||||
|
||||
* Mon Feb 26 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 101-1
|
||||
- New upstream release
|
||||
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (osbuild-composer-101.tar.gz) = f2df537865464cbf3eb2d37b5637797ad47d540784ff066fb2108ea44c941363967862b893fd7c72b6338597c880def4786ba4c552fc5b53ea868a1a341fff39
|
||||
SHA512 (osbuild-composer-102.tar.gz) = c07b7f1b1f473680c0d223cdaef3e7d401fc3a074500b633f685ddbe51575b3c1da8c39013a2810af7809a048319efd3f96d6be8ead1275889c634a06a9aca50
|
||||
|
@ -1,38 +0,0 @@
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user