Merge branch 'i9c-temp' into i9

.gitignore

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

.osbuild-composer.metadata

@@ -1 +1 @@
-520bf4f4c08543615d5bcf64ab067845b71cfee8 SOURCES/osbuild-composer-62.1.tar.gz
+f68a24e9d6a407708e33d72240b140e9c60378f1 SOURCES/osbuild-composer-76.tar.gz

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

@@ -0,0 +1,83 @@
+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:        62.1
+Version:        76
 
 %gometa
 
@@ -22,17 +22,28 @@ 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
 ExcludeArch:    i686 armv7hl
 
 # Upstream license specification: Apache-2.0
-License:        ASL 2.0
+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
 # MSVSphere patches
 Patch1001:      0001-Add-MSVSphere-9.1-support.patch
 
@@ -59,17 +70,6 @@ Requires: systemd
 
 Provides: weldr
 
-%if 0%{?rhel}
-Obsoletes: lorax-composer <= 29
-Conflicts: lorax-composer
-%endif
-
-# Remove when we stop releasing into Fedora 35
-%if 0%{?fedora} >= 34
-# lorax 34.3 is the first one without the composer subpackage
-Obsoletes: lorax-composer < 34.3
-%endif
-
 %description
 %{common_description}
 
@@ -321,10 +321,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 >= 63
+Requires:   osbuild >= 81
-Requires:   osbuild-ostree >= 63
+Requires:   osbuild-ostree >= 81
-Requires:   osbuild-lvm2 >= 63
+Requires:   osbuild-lvm2 >= 81
-Requires:   osbuild-luks2 >= 63
+Requires:   osbuild-luks2 >= 81
 Requires:   %{name}-dnf-json = %{version}-%{release}
 
 %description worker
@@ -341,8 +341,9 @@ The worker for osbuild-composer
 %preun worker
 # systemd_preun uses systemctl disable --now which doesn't work well with template services.
 # See https://github.com/systemd/systemd/issues/15620
-# The following lines mimicks its behaviour by running two commands:
+# The following lines mimicks its behaviour by running two commands.
-if [ -d /run/systemd/system ]; then
+# The scriptlet is supposed to run only when the package is being removed.
+if [ $1 -eq 0 ] && [ -d /run/systemd/system ]; then
     # disable and stop all the worker services
     systemctl --no-reload disable osbuild-worker@.service osbuild-remote-worker@.service
     systemctl stop "osbuild-worker@*.service" "osbuild-remote-worker@*.service"
@@ -356,7 +357,7 @@ fi
 Summary: The dnf-json binary used by osbuild-composer and the workers
 
 # Conflicts with older versions of composer that provide the same files
-# this can be removed when RHEL 8 and Fedora 35 reach EOL
+# this can be removed when RHEL 8 reaches EOL
 Conflicts: osbuild-composer <= 35
 
 %description dnf-json
@@ -365,6 +366,12 @@ The dnf-json binary used by osbuild-composer and the workers.
 %files dnf-json
 %{_libexecdir}/osbuild-composer/dnf-json
 
+%post dnf-json
+# Fix ownership of the rpmmd cache files from previous versions where it was owned by root:root
+if [ -e /var/cache/osbuild-composer/rpmmd ]; then
+    chown -f -R --from root:root _osbuild-composer:_osbuild-composer /var/cache/osbuild-composer/rpmmd
+fi
+
 %if %{with tests} || 0%{?rhel}
 
 %package tests
@@ -436,11 +443,48 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
 %endif
 
 %changelog
+* Wed May 24 2023 Sergey Cherevko <s.cherevko@msvsphere.ru> - 76-2.inferit
+- Rebuilt for MSVSphere 9.2
+
 * Thu Mar 30 2023 Eugene Zamriy <ezamriy@msvsphere.ru> - 62.1-1.inferit
 - Added MSVSphere 9.1 support
 - Rebuilt for MSVSphere 9.1
 
-* Fri Sep 16 2022 Achilleas Koutsou <achilleas@redhat.com> - 62.1-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 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
+
+* Wed Feb 08 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 74-1
+- New upstream release
+
+* Wed Jan 25 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 73-1
+- New upstream release
+
+* Wed Jan 11 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 72-1
+- New upstream release
+
+* Wed Dec 28 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 71-1
+- New upstream release
+
+* Wed Dec 14 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 70-1
+- New upstream release
+
+* Wed Nov 30 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 69-1
+- New upstream release
+
+* 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
 
 * Mon Aug 29 2022 Ondřej Budai <ondrej@budai.cz> - 62-1