Compare commits
No commits in common. "imports/c9/osbuild-composer-76-2.el9_2" and "c8" have entirely different histories.
imports/c9
...
c8
|
|
@ -1 +1 @@
|
|||
SOURCES/osbuild-composer-76.tar.gz
|
||||
SOURCES/osbuild-composer-75.tar.gz
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
f68a24e9d6a407708e33d72240b140e9c60378f1 SOURCES/osbuild-composer-76.tar.gz
|
||||
b03146ce367157bf2ea8028c1a9bdbf27e69de97 SOURCES/osbuild-composer-75.tar.gz
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
%global goipath github.com/osbuild/osbuild-composer
|
||||
|
||||
Version: 76
|
||||
Version: 75
|
||||
|
||||
%gometa
|
||||
|
||||
|
|
@ -22,7 +22,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
|
||||
|
|
@ -33,17 +33,6 @@ License: Apache-2.0
|
|||
URL: %{gourl}
|
||||
Source0: %{gosource}
|
||||
|
||||
# Patches were generated from the upstream 'rhel-9.2.0' branch:
|
||||
# git clone https://github.com/osbuild/osbuild-composer.git
|
||||
# cd osbuild-composer/
|
||||
# git checkout rhel-9.2.0
|
||||
# git format-patch HEAD...v76
|
||||
#
|
||||
# https://github.com/osbuild/osbuild-composer/pull/3349
|
||||
Patch0: 0001-tests-ostree-Change-centos-8-BOOT_LOCATION-to-a-work.patch
|
||||
Patch1: 0002-distro-rhel-add-payload-repos-to-os-package-set.patch
|
||||
# https://github.com/osbuild/osbuild-composer/pull/3348
|
||||
Patch2: 0003-Manifest-always-set-kernel-options-in-grub2-stage.patch
|
||||
|
||||
BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
|
||||
BuildRequires: systemd
|
||||
|
|
@ -306,10 +295,10 @@ The core osbuild-composer binary. This is suitable both for spawning in containe
|
|||
Summary: The worker for osbuild-composer
|
||||
Requires: systemd
|
||||
Requires: qemu-img
|
||||
Requires: osbuild >= 81
|
||||
Requires: osbuild-ostree >= 81
|
||||
Requires: osbuild-lvm2 >= 81
|
||||
Requires: osbuild-luks2 >= 81
|
||||
Requires: osbuild >= 80
|
||||
Requires: osbuild-ostree >= 80
|
||||
Requires: osbuild-lvm2 >= 80
|
||||
Requires: osbuild-luks2 >= 80
|
||||
Requires: %{name}-dnf-json = %{version}-%{release}
|
||||
|
||||
%description worker
|
||||
|
|
@ -428,13 +417,6 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* 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 01 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 76-1
|
||||
- New upstream release
|
||||
|
||||
* Wed Feb 22 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 75-1
|
||||
- New upstream release
|
||||
|
||||
|
|
@ -459,9 +441,6 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
|
|||
* Wed Nov 16 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 68-1
|
||||
- New upstream release
|
||||
|
||||
* 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
|
||||
|
||||
|
|
@ -471,13 +450,13 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
|
|||
* Wed Aug 24 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 60-1
|
||||
- New upstream release
|
||||
|
||||
* Wed Aug 10 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 59-1
|
||||
* Thu Aug 11 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 59-1
|
||||
- New upstream release
|
||||
|
||||
* Thu Jul 28 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 58-1
|
||||
- New upstream release
|
||||
|
||||
* Wed Jul 13 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 57-1
|
||||
* Mon Jul 18 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 57-1
|
||||
- New upstream release
|
||||
|
||||
* Wed Jun 15 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 55-1
|
||||
|
|
@ -486,139 +465,81 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
|
|||
* Wed Jun 01 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 54-1
|
||||
- New upstream release
|
||||
|
||||
* Fri May 20 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 53-1
|
||||
* Mon May 23 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 53-1
|
||||
- New upstream release
|
||||
|
||||
* Wed May 04 2022 Ondřej Budai <ondrej@budai.cz> - 51-1
|
||||
- New upstream release
|
||||
|
||||
* Mon Feb 28 2022 Simon Steinbeiss <simon.steinbeiss@redhat.com> - 46-1
|
||||
* Tue Mar 01 2022 Ondřej Budai <ondrej@budai.cz> - 46-1
|
||||
- New upstream release
|
||||
|
||||
* Fri Feb 18 2022 Ondřej Budai <ondrej@budai.cz> - 45-1
|
||||
* Sat Feb 19 2022 Ondřej Budai <ondrej@budai.cz> - 45-1
|
||||
- New upstream release
|
||||
|
||||
* Fri Feb 11 2022 Thomas Lavocat <tlavocat@redhat.com> - 44-1
|
||||
* Mon Feb 14 2022 Thomas Lavocat <tlavocat@redhat.com> - 44-1
|
||||
- New upstream release
|
||||
|
||||
* Wed Jan 26 2022 Thomas Lavocat <tlavocat@redhat.com> - 43-1
|
||||
* Mon Feb 07 2022 Thomas Lavocat <tlavocat@redhat.com> - 43-1
|
||||
- New upstream release
|
||||
|
||||
* Wed Jan 12 2022 Thomas Lavocat <tlavocat@redhat.com> - 42-1
|
||||
- New upstream release
|
||||
|
||||
* Wed Dec 22 2021 Ondřej Budai <ondrej@budai.cz> - 41-1
|
||||
* Tue Jan 18 2022 Thomas Lavocat <tlavocat@redhat.com> - 42-1
|
||||
- New upstream release
|
||||
|
||||
* Thu Dec 09 2021 Ondřej Budai <ondrej@budai.cz> - 40-1
|
||||
- New upstream release
|
||||
|
||||
* Wed Nov 24 2021 Chloe Kaubisch <chloe.kaubisch@gmail.com> - 39-1
|
||||
* Fri Oct 15 2021 Achilleas Koutsou <achilleas@redhat.com> - 37-1
|
||||
- New upstream release
|
||||
|
||||
* Fri Nov 12 2021 'Diaa Sami' <'<disami@redhat.com>'> - 38-1
|
||||
- New upstream release
|
||||
|
||||
* Tue Nov 02 2021 lavocatt - 37-1
|
||||
- New upstream release
|
||||
|
||||
* Thu Oct 14 2021 Achilleas Koutsou <achilleas@redhat.com> - 36-1
|
||||
* Fri Oct 15 2021 Achilleas Koutsou <achilleas@redhat.com> - 36-1
|
||||
- New upstream release
|
||||
|
||||
* Mon Aug 30 2021 Tom Gundersen <teg@jklm.no> - 33-1
|
||||
- New upstream release
|
||||
|
||||
* Sun Aug 29 2021 Tom Gundersen <teg@jklm.no> - 32-1
|
||||
* Sun Aug 29 2021 Tom Gundersen <teg@jklm.no> - 32-2
|
||||
- New upstream release
|
||||
|
||||
* Sun Aug 15 2021 Ondřej Budai <ondrej@budai.cz> - 31-1
|
||||
- New upstream release
|
||||
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 30-2
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Fri Jul 02 2021 Ondřej Budai <ondrej@budai.cz> - 30-1
|
||||
- New upstream release
|
||||
|
||||
* Tue Jun 22 2021 Mohan Boddu <mboddu@redhat.com> - 29-3
|
||||
- Rebuilt for RHEL 9 BETA for openssl 3.0
|
||||
Related: rhbz#1971065
|
||||
|
||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 29-2
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
|
||||
* Fri Mar 05 2021 Martin Sehnoutka <msehnout@redhat.com> - 29-1
|
||||
* Thu Aug 12 2021 Ondřej Budai <ondrej@budai.cz> - 31-1
|
||||
- New upstream release
|
||||
|
||||
* Sat Feb 20 2021 Martin Sehnoutka <msehnout@redhat.com> - 28-1
|
||||
- New upstream release
|
||||
|
||||
* Thu Feb 04 2021 Ondrej Budai <obudai@redhat.com> - 27-1
|
||||
* Fri Feb 05 2021 Ondrej Budai <obudai@redhat.com> - 27-1
|
||||
- New upstream release
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 26-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Thu Dec 17 2020 Ondrej Budai <obudai@redhat.com> - 26-2
|
||||
- Fix the compatibility with a new golang-github-azure-storage-blob 0.12
|
||||
|
||||
* Thu Dec 17 2020 Ondrej Budai <obudai@redhat.com> - 26-1
|
||||
- New upstream release
|
||||
|
||||
* Thu Nov 19 2020 Ondrej Budai <obudai@redhat.com> - 25-1
|
||||
- New upstream release
|
||||
* Mon Nov 30 2020 Ondrej Budai <obudai@redhat.com> - 25-1
|
||||
- New upstream release 25 (rhbz#1883481)
|
||||
|
||||
* Thu Nov 12 2020 Ondrej Budai <obudai@redhat.com> - 24-1
|
||||
- New upstream release
|
||||
* Thu Sep 03 2020 Tom Gundersen <tgunders@redhat.com> - 20.1-1
|
||||
- New upstream release 20.1 (rhbz#1872370)
|
||||
|
||||
* Fri Nov 06 2020 Ondrej Budai <obudai@redhat.com> - 23-1
|
||||
- New upstream release
|
||||
* Sun Aug 23 2020 Tom Gundersen <tgunders@redhat.com> - 20-1
|
||||
- New upstream release 20 (rhbz#1871184 and rhbz#1871179)
|
||||
|
||||
* Fri Oct 16 2020 Ondrej Budai <obudai@redhat.com> - 22-1
|
||||
- New upstream release
|
||||
* Thu Aug 13 2020 Tom Gundersen <tgunders@redhat.com> - 19-1
|
||||
- New upstream release 19 (rhbz#1866015 and rhbz#1866013)
|
||||
|
||||
* Sun Aug 23 2020 Tom Gundersen <teg@jklm.no> - 20-1
|
||||
- New upstream release
|
||||
|
||||
* Tue Aug 11 2020 Tom Gundersen <teg@jklm.no> - 19-1
|
||||
- New upstream release
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 18-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Wed Jul 22 2020 Ondrej Budai <obudai@redhat.com> - 18-1
|
||||
- New upstream release
|
||||
|
||||
* Wed Jul 08 2020 Ondrej Budai <obudai@redhat.com> - 17-1
|
||||
- New upstream release
|
||||
* Thu Jul 09 2020 Ondrej Budai <obudai@redhat.com> - 17-1
|
||||
- New upstream release 17 (rhbz#1831653)
|
||||
- Obsolete lorax-composer in favor of osbuild-composer (rhbz#1836844)
|
||||
|
||||
* Mon Jun 29 2020 Ondrej Budai <obudai@redhat.com> - 16-1
|
||||
- New upstream release
|
||||
- New upstream release 16 (rhbz#1831653)
|
||||
|
||||
* Fri Jun 12 2020 Ondrej Budai <obudai@redhat.com> - 15-1
|
||||
- New upstream release
|
||||
- New upstream release 15 (rhbz#1831653)
|
||||
|
||||
* Thu Jun 04 2020 Ondrej Budai <obudai@redhat.com> - 14-1
|
||||
- New upstream release
|
||||
|
||||
* Fri May 29 2020 Ondrej Budai <obudai@redhat.com> - 13-2
|
||||
- Add missing osbuild-ostree dependency
|
||||
- New upstream release 14 (rhbz#1831653)
|
||||
|
||||
* Thu May 28 2020 Ondrej Budai <obudai@redhat.com> - 13-1
|
||||
- New upstream release
|
||||
- New upstream release 13 (rhbz#1831653)
|
||||
|
||||
* Thu May 14 2020 Ondrej Budai <obudai@redhat.com> - 12-1
|
||||
- New upstream release
|
||||
|
||||
* Wed Apr 29 2020 Ondrej Budai <obudai@redhat.com> - 11-1
|
||||
- New upstream release
|
||||
|
||||
* Wed Apr 15 2020 Ondrej Budai <obudai@redhat.com> - 10-1
|
||||
- New upstream release
|
||||
|
||||
* Wed Apr 01 2020 Ondrej Budai <obudai@redhat.com> - 9-1
|
||||
- New upstream release
|
||||
|
||||
* Mon Mar 23 2020 Ondrej Budai <obudai@redhat.com> - 8-1
|
||||
- Initial package (renamed from golang-github-osbuild-composer)
|
||||
* Tue May 05 2020 Ondrej Budai <obudai@redhat.com> - 11-1
|
||||
- Initial package (renamed from golang-github-osbuild-composer) (rhbz#1771887)
|
||||
|
|
|
|||
Loading…
Reference in New Issue