Update to 102

Resolves: RHEL-1035

.gitignore

@@ -72,3 +72,5 @@
 /osbuild-composer-98.tar.gz
 /osbuild-composer-99.tar.gz
 /osbuild-composer-100.tar.gz
+/osbuild-composer-101.tar.gz
+/osbuild-composer-102.tar.gz

.osbuild-composer.metadata

@@ -0,0 +1 @@
+be22f539bc87b1277df2d95b4c2c75c88ea4461c osbuild-composer-102.tar.gz

osbuild-composer.spec

@@ -7,9 +7,12 @@
 # This is used internally during nightly pipeline testing!
 %bcond_with relax_requires
 
+# The minimum required osbuild version
+%global min_osbuild_version 109
+
 %global goipath         github.com/osbuild/osbuild-composer
 
-Version:        100
+Version:        102
 
 %gometa
 
@@ -103,6 +106,8 @@ export LDFLAGS="${LDFLAGS} -X 'github.com/osbuild/osbuild-composer/internal/comm
 
 %gobuild ${GOTAGS:+-tags=$GOTAGS} -o _bin/osbuild-composer %{goipath}/cmd/osbuild-composer
 %gobuild ${GOTAGS:+-tags=$GOTAGS} -o _bin/osbuild-worker %{goipath}/cmd/osbuild-worker
+%gobuild ${GOTAGS:+-tags=$GOTAGS} -o _bin/osbuild-jobsite-manager %{goipath}/cmd/osbuild-jobsite-manager
+%gobuild ${GOTAGS:+-tags=$GOTAGS} -o _bin/osbuild-jobsite-builder %{goipath}/cmd/osbuild-jobsite-builder
 
 make man
 
@@ -137,7 +142,8 @@ go build -tags="integration${GOTAGS:+,$GOTAGS}" -ldflags="${TEST_LDFLAGS}" -o _b
 install -m 0755 -vd                                                %{buildroot}%{_libexecdir}/osbuild-composer
 install -m 0755 -vp _bin/osbuild-composer                          %{buildroot}%{_libexecdir}/osbuild-composer/
 install -m 0755 -vp _bin/osbuild-worker                            %{buildroot}%{_libexecdir}/osbuild-composer/
-install -m 0755 -vp dnf-json                                       %{buildroot}%{_libexecdir}/osbuild-composer/
+install -m 0755 -vp _bin/osbuild-jobsite-manager                   %{buildroot}%{_libexecdir}/osbuild-composer/
+install -m 0755 -vp _bin/osbuild-jobsite-builder                   %{buildroot}%{_libexecdir}/osbuild-composer/
 
 # Only include repositories for the distribution and release
 install -m 0755 -vd                                                %{buildroot}%{_datadir}/osbuild-composer/repositories
@@ -294,7 +300,9 @@ cd $PWD/_build/src/%{goipath}
 
 %package core
 Summary:    The core osbuild-composer binary
-Requires:   %{name}-dnf-json = %{version}-%{release}
+Requires:   osbuild-depsolve-dnf >= %{min_osbuild_version}
+Provides:   %{name}-dnf-json = %{version}-%{release}
+Obsoletes:  %{name}-dnf-json < %{version}-%{release}
 
 %description core
 The core osbuild-composer binary. This is suitable both for spawning in containers and by systemd.
@@ -307,17 +315,21 @@ 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 >= 98
-Requires:   osbuild-ostree >= 98
-Requires:   osbuild-lvm2 >= 98
-Requires:   osbuild-luks2 >= 98
-Requires:   %{name}-dnf-json = %{version}-%{release}
+Requires:   osbuild >= %{min_osbuild_version}
+Requires:   osbuild-ostree >= %{min_osbuild_version}
+Requires:   osbuild-lvm2 >= %{min_osbuild_version}
+Requires:   osbuild-luks2 >= %{min_osbuild_version}
+Requires:   osbuild-depsolve-dnf >= %{min_osbuild_version}
+Provides:   %{name}-dnf-json = %{version}-%{release}
+Obsoletes:  %{name}-dnf-json < %{version}-%{release}
 
 %description worker
 The worker for osbuild-composer
 
 %files worker
 %{_libexecdir}/osbuild-composer/osbuild-worker
+%{_libexecdir}/osbuild-composer/osbuild-jobsite-manager
+%{_libexecdir}/osbuild-composer/osbuild-jobsite-builder
 %{_unitdir}/osbuild-worker@.service
 %{_unitdir}/osbuild-remote-worker@.service
 
@@ -339,25 +351,6 @@ fi
 # restart all the worker services
 %systemd_postun_with_restart "osbuild-worker@*.service" "osbuild-remote-worker@*.service"
 
-%package dnf-json
-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 reaches EOL
-Conflicts: osbuild-composer <= 35
-
-%description dnf-json
-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
@@ -429,6 +422,12 @@ 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
+
 * Wed Feb 07 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 100-1
 - New upstream release
 

sources

@@ -1 +1 @@
-SHA512 (osbuild-composer-100.tar.gz) = efe5e7592c01dfcc4513ecbf2b42050831d0c3b2a5837ab116507acbc46a0af50e5ef0ac189dbaf253cd8021f80c76ce7f592260ce909e2b2d04c0969037e96d
+SHA512 (osbuild-composer-102.tar.gz) = c07b7f1b1f473680c0d223cdaef3e7d401fc3a074500b633f685ddbe51575b3c1da8c39013a2810af7809a048319efd3f96d6be8ead1275889c634a06a9aca50

tools-provision.sh-copy-RHEL-repo-overrides-using-wi.patch

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