import osbuild-composer-88-1.el9

.gitignore

@@ -1 +1 @@
-SOURCES/osbuild-composer-76.tar.gz
+SOURCES/osbuild-composer-88.tar.gz

.osbuild-composer.metadata

@@ -1 +1 @@
-f68a24e9d6a407708e33d72240b140e9c60378f1 SOURCES/osbuild-composer-76.tar.gz
+9566fbe6bba91c7b3aba1a57c900aa6c00f77397 SOURCES/osbuild-composer-88.tar.gz

SOURCES/0001-tests-ostree-Change-centos-8-BOOT_LOCATION-to-a-work.patch

@@ -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
-

SPECS/osbuild-composer.spec

@@ -9,7 +9,7 @@
 
 %global goipath         github.com/osbuild/osbuild-composer
 
-Version:        76
+Version:        88
 
 %gometa
 
@@ -22,7 +22,7 @@ It is compatible with composer-cli and cockpit-composer clients.
 }
 
 Name:           osbuild-composer
-Release:        2%{?dist}.2
+Release:        1%{?dist}
 Summary:        An image building service based on osbuild
 
 # osbuild-composer doesn't have support for building i686 and armv7hl images
@@ -33,21 +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
-# https://github.com/osbuild/osbuild-composer/pull/3410
-Patch3: 0004-simplified-installer-enable-isolinux.patch
-# https://github.com/osbuild/osbuild-composer/pull/3411
-Patch4: 0005-Save-manifest-lists-when-pulling-containers-Set-container-local-names-explicitly.patch
 
 BuildRequires:  %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
 BuildRequires:  systemd
@@ -129,7 +114,6 @@ go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-image-te
 go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-auth-tests %{goipath}/cmd/osbuild-auth-tests
 go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-koji-tests %{goipath}/cmd/osbuild-koji-tests
 go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-composer-dbjobqueue-tests %{goipath}/cmd/osbuild-composer-dbjobqueue-tests
-go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-composer-manifest-tests %{goipath}/cmd/osbuild-composer-manifest-tests
 go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-service-maintenance-tests %{goipath}/cmd/osbuild-service-maintenance
 go build -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-mock-openid-provider %{goipath}/cmd/osbuild-mock-openid-provider
 
@@ -195,7 +179,6 @@ install -m 0755 -vp _bin/osbuild-image-tests                       %{buildroot}%
 install -m 0755 -vp _bin/osbuild-auth-tests                        %{buildroot}%{_libexecdir}/osbuild-composer-test/
 install -m 0755 -vp _bin/osbuild-koji-tests                        %{buildroot}%{_libexecdir}/osbuild-composer-test/
 install -m 0755 -vp _bin/osbuild-composer-dbjobqueue-tests         %{buildroot}%{_libexecdir}/osbuild-composer-test/
-install -m 0755 -vp _bin/osbuild-composer-manifest-tests           %{buildroot}%{_libexecdir}/osbuild-composer-test/
 install -m 0755 -vp _bin/osbuild-service-maintenance-tests         %{buildroot}%{_libexecdir}/osbuild-composer-test/
 install -m 0755 -vp _bin/osbuild-mock-openid-provider              %{buildroot}%{_libexecdir}/osbuild-composer-test/
 install -m 0755 -vp tools/define-compose-url.sh                    %{buildroot}%{_libexecdir}/osbuild-composer-test/
@@ -276,13 +259,13 @@ cd $PWD/_build/src/%{goipath}
 %endif
 
 %post
-%systemd_post osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-remote-worker.socket
+%systemd_post osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-composer-prometheus.socket osbuild-remote-worker.socket
 
 %preun
-%systemd_preun osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-remote-worker.socket
+%systemd_preun osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-composer-prometheus.socket osbuild-remote-worker.socket
 
 %postun
-%systemd_postun_with_restart osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-remote-worker.socket
+%systemd_postun_with_restart osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-composer-prometheus.socket osbuild-remote-worker.socket
 
 %files
 %license LICENSE
@@ -291,6 +274,7 @@ cd $PWD/_build/src/%{goipath}
 %{_unitdir}/osbuild-composer.service
 %{_unitdir}/osbuild-composer.socket
 %{_unitdir}/osbuild-composer-api.socket
+%{_unitdir}/osbuild-composer-prometheus.socket
 %{_unitdir}/osbuild-local-worker.socket
 %{_unitdir}/osbuild-remote-worker.socket
 %{_sysusersdir}/osbuild-composer.conf
@@ -310,10 +294,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-1.el9_2.1
+Requires:   osbuild >= 93
-Requires:   osbuild-ostree >= 81-1.el9_2.1
+Requires:   osbuild-ostree >= 93
-Requires:   osbuild-lvm2 >= 81-1.el9_2.1
+Requires:   osbuild-lvm2 >= 93
-Requires:   osbuild-luks2 >= 81-1.el9_2.1
+Requires:   osbuild-luks2 >= 93
 Requires:   %{name}-dnf-json = %{version}-%{release}
 
 %description worker
@@ -432,19 +416,36 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
 %endif
 
 %changelog
-* Tue Apr 25 2023 Achilleas Koutsou <achilleas@redhat.com> - 76-2.2
+* Thu Aug 24 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 88-1
-- Save manifest lists when pulling containers & Set container local names explicitly (rhbz#2189400)
+- New upstream release
+
+* Wed Aug 09 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 87-1
+- New upstream release
+
+* Wed Jul 26 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 86-1
+- New upstream release
+
+* Fri Jul 14 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 85-1
+- New upstream release
 
-* Tue Apr 25 2023 Tomáš Hozza <thozza@redhat.com> - 76-2.1
+* Wed Jun 14 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 84-1
-- simplified-installer: enable isolinux (rhbz#2178130)
+- New upstream release
+
+* Wed May 17 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 82-1
+- New upstream release
+
+* Wed Apr 19 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 80-1
+- New upstream release
 
-* Mon Mar 27 2023 Tomáš Hozza <thozza@redhat.com> - 76-2
+* Wed Apr 05 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 79-1
-- distro/rhel: add payload repos to os package set (rhbz#2177699)
+- New upstream release
-- 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
+- New upstream release
+
 * Wed Mar 01 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 76-1
 - New upstream release