rpms
/
osbuild-composer
21
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'i9c' with version 101-2 into 'i9'

Browse Source
i9 changed/i9/osbuild-composer-101-2.el9_4.inferit
Sergey Cherevko 3 months ago
parent b2c0224493 de507d7b72
commit 550dcf00ed
Signed by: scherevko
GPG Key ID: D87CBBC16D2E4A72
6 changed files with 10 additions and 13166 deletions
Show Stats Download Patch File Download Diff File

83
SOURCES/0001-tests-ostree-Change-centos-8-BOOT_LOCATION-to-a-work.patch
Unescape View File

@ -1,83 +0,0 @@
From 30f4b0753691841e232701a3ad17f018e8799ebe Mon Sep 17 00:00:00 2001
From: Jakub Rusz <jrusz@redhat.com>
Date: Mon, 20 Mar 2023 15:29:42 +0100
Subject: [PATCH 1/3] tests/ostree: Change centos-8 BOOT_LOCATION to a working
boot.iso
The latest boot.iso stopped working. Changing to an older version to
unblock CI. RHBZ#2180024 opened with this issue.
---
test/cases/ostree-rebase-bios.sh | 4 ++--
test/cases/ostree-rebase-uefi.sh | 4 ++--
test/cases/ostree.sh | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/test/cases/ostree-rebase-bios.sh b/test/cases/ostree-rebase-bios.sh
index 702b506c8..7390c2a0e 100755
--- a/test/cases/ostree-rebase-bios.sh
+++ b/test/cases/ostree-rebase-bios.sh
@@ -108,7 +108,7 @@ case "${ID}-${VERSION_ID}" in
"centos-8")
OSTREE_REF="centos/8/${ARCH}/edge"
OS_VARIANT="centos8"
- BOOT_LOCATION="http://mirror.centos.org/centos/8-stream/BaseOS/x86_64/os/"
+ BOOT_LOCATION="https://composes.centos.org/latest-CentOS-Stream-8/compose/BaseOS/x86_64/os/"
PARENT_REF="centos/8/${ARCH}/edge"
KERNEL_RT_PKG="kernel-rt-core"
;;
@@ -356,7 +356,7 @@ echo -e 'admin\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers
STOPHERE
# Get the boot.iso from BOOT_LOCATION
-curl -O "$BOOT_LOCATION"/images/boot.iso
+curl -O "$BOOT_LOCATION"images/boot.iso
sudo mv boot.iso /var/lib/libvirt/images
LOCAL_BOOT_LOCATION="/var/lib/libvirt/images/boot.iso"
diff --git a/test/cases/ostree-rebase-uefi.sh b/test/cases/ostree-rebase-uefi.sh
index c0697f543..7c3fd7721 100755
--- a/test/cases/ostree-rebase-uefi.sh
+++ b/test/cases/ostree-rebase-uefi.sh
@@ -108,7 +108,7 @@ case "${ID}-${VERSION_ID}" in
"centos-8")
OSTREE_REF="centos/8/${ARCH}/edge"
OS_VARIANT="centos8"
- BOOT_LOCATION="http://mirror.centos.org/centos/8-stream/BaseOS/x86_64/os/"
+ BOOT_LOCATION="https://composes.centos.org/latest-CentOS-Stream-8/compose/BaseOS/x86_64/os/"
PARENT_REF="centos/8/${ARCH}/edge"
KERNEL_RT_PKG="kernel-rt-core"
;;
@@ -358,7 +358,7 @@ LIBVIRT_IMAGE_PATH=/var/lib/libvirt/images/${IMAGE_KEY}-uefi.qcow2
sudo qemu-img create -f qcow2 "${LIBVIRT_IMAGE_PATH}" 20G
# Get the boot.iso from BOOT_LOCATION
-curl -O "$BOOT_LOCATION"/images/boot.iso
+curl -O "$BOOT_LOCATION"images/boot.iso
sudo mv boot.iso /var/lib/libvirt/images
LOCAL_BOOT_LOCATION="/var/lib/libvirt/images/boot.iso"
diff --git a/test/cases/ostree.sh b/test/cases/ostree.sh
index f2841d953..0cfe6d02a 100755
--- a/test/cases/ostree.sh
+++ b/test/cases/ostree.sh
@@ -104,7 +104,7 @@ case "${ID}-${VERSION_ID}" in
OSTREE_REF="centos/8/${ARCH}/edge"
OS_VARIANT="centos8"
USER_IN_COMMIT="true"
- BOOT_LOCATION="http://mirror.centos.org/centos/8-stream/BaseOS/x86_64/os/"
+ BOOT_LOCATION="https://composes.centos.org/latest-CentOS-Stream-8/compose/BaseOS/x86_64/os/"
EMBEDED_CONTAINER="true"
FIREWALL_FEATURE="false"
DIRS_FILES_CUSTOMIZATION="true"
@@ -486,7 +486,7 @@ if [[ "${USER_IN_COMMIT}" == "true" ]]; then
fi
# Get the boot.iso from BOOT_LOCATION
-curl -O "$BOOT_LOCATION"/images/boot.iso
+curl -O "$BOOT_LOCATION"images/boot.iso
sudo mv boot.iso /var/lib/libvirt/images
LOCAL_BOOT_LOCATION="/var/lib/libvirt/images/boot.iso"
--
2.39.2

3803
SOURCES/0002-distro-rhel-add-payload-repos-to-os-package-set.patch
View File

File diff suppressed because it is too large Load Diff

2655
SOURCES/0003-Manifest-always-set-kernel-options-in-grub2-stage.patch
View File

File diff suppressed because it is too large Load Diff

1499
SOURCES/0004-simplified-installer-enable-isolinux.patch
View File

File diff suppressed because it is too large Load Diff

5104
SOURCES/0005-Save-manifest-lists-when-pulling-containers-Set-container-local-names-explicitly.patch
View File

File diff suppressed because it is too large Load Diff

32
SPECS/osbuild-composer.spec
Unescape View File

@ -25,7 +25,7 @@ It is compatible with composer-cli and cockpit-composer clients.
}
Name: osbuild-composer
Release: 1%{?dist}.inferit
Release: 2%{?dist}.inferit
Summary: An image building service based on osbuild
# osbuild-composer doesn't have support for building i686 and armv7hl images
@ -435,6 +435,14 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
%endif
%changelog
* Fri Sep 27 2024 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 101-2.inferit
- Update to 101-2
* Wed Sep 25 2024 Tomáš Hozza <thozza@redhat.com> - 101-2
- Rebuilt to fix:
- CVE-2024-34156
- RHEL-57945
* Wed May 1 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 101-1.inferit
- Added MSVSphere support
@ -483,31 +491,15 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
* Fri Jul 14 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 85-1
- New upstream release
* Wed Jun 21 2023 Sergey Cherevko <s.cherevko@msvsphere.ru> - 76-2.2.inferit
- Rebuilt for MSVSphere 9.2
* Wed Jun 14 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 84-1
- New upstream release
* Thu May 25 2023 Sergey Cherevko <s.cherevko@msvsphere.ru> - 76-2.inferit
- Added MSVSphere 9.2 support
- Rebuilt for MSVSphere 9.2
* Wed May 17 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 82-1
- New upstream release
* Tue Apr 25 2023 Achilleas Koutsou <achilleas@redhat.com> - 76-2.2
- Save manifest lists when pulling containers & Set container local names explicitly (rhbz#2189400)
* Tue Apr 25 2023 Tomáš Hozza <thozza@redhat.com> - 76-2.1
- simplified-installer: enable isolinux (rhbz#2178130)
* Wed Apr 19 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 80-1
- New upstream release
* Fri Apr 14 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 79-1
- Rebuilt for MSVSphere 9.2 beta
* Wed Apr 05 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 79-1
- New upstream release
@ -515,11 +507,7 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
- Added MSVSphere 9.1 support
- Rebuilt for MSVSphere 9.1
* Mon Mar 27 2023 Tomáš Hozza <thozza@redhat.com> - 76-2
- distro/rhel: add payload repos to os package set (rhbz#2177699)
- Manifest: always set kernel options in grub2 stage (rhbz#2162299)
* Wed Mar 15 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 62.1-1
* Wed Mar 15 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 77-1
- Rebuilt for MSVSphere 9.1.
* Wed Mar 08 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 77-1

Write Preview
Loading…
Cancel
Save