From 58a2fe272579ffc5a5345876f8dc95dc08e0b92a Mon Sep 17 00:00:00 2001 From: imagebuilder-bot Date: Wed, 12 Jun 2024 09:34:12 +0000 Subject: [PATCH] Update to 110 Resolves: RHEL-27178 --- .gitignore | 1 + osbuild-composer.spec | 38 ++++++++++++++++++++++++++++++-------- sources | 2 +- 3 files changed, 32 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index f68ad2e..da0ad19 100644 --- a/.gitignore +++ b/.gitignore @@ -77,3 +77,4 @@ /osbuild-composer-104.tar.gz /osbuild-composer-108.tar.gz /osbuild-composer-109.tar.gz +/osbuild-composer-110.tar.gz diff --git a/osbuild-composer.spec b/osbuild-composer.spec index 8ffd72e..5f63d96 100644 --- a/osbuild-composer.spec +++ b/osbuild-composer.spec @@ -12,7 +12,7 @@ %global goipath github.com/osbuild/osbuild-composer -Version: 109 +Version: 110 %gometa @@ -106,6 +106,7 @@ 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-worker-executor %{goipath}/cmd/osbuild-worker-executor %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 @@ -126,6 +127,10 @@ export GOPATH=%{gobuilddir}:%{gopath} TEST_LDFLAGS="${LDFLAGS:-} -B 0x$(od -N 20 -An -tx1 -w100 /dev/urandom | tr -d ' ')" +%if 0%{?rhel} +GOTAGS="${GOTAGS:+$GOTAGS,}rhel%{rhel}" +%endif + go test -c -tags="integration${GOTAGS:+,$GOTAGS}" -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-composer-cli-tests %{goipath}/cmd/osbuild-composer-cli-tests go test -c -tags="integration${GOTAGS:+,$GOTAGS}" -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-dnf-json-tests %{goipath}/cmd/osbuild-dnf-json-tests go test -c -tags="integration${GOTAGS:+,$GOTAGS}" -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-weldr-tests %{goipath}/internal/client/ @@ -142,33 +147,42 @@ 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 _bin/osbuild-worker-executor %{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 + # CentOS also defines rhel so we check for centos first %if 0%{?centos} -# CentOS 9 supports building for CentOS 8 and later -%if 0%{?centos} >= 9 +# Latest CentOS supports building all CentOS versions +%if 0%{?centos} >= 10 install -m 0644 -vp repositories/centos-* %{buildroot}%{_datadir}/osbuild-composer/repositories/ + %else -# CentOS 8 only supports building for CentOS 8 +# All other CentOS versions support building for the same version install -m 0644 -vp repositories/centos-%{centos}* %{buildroot}%{_datadir}/osbuild-composer/repositories/ install -m 0644 -vp repositories/centos-stream-%{centos}* %{buildroot}%{_datadir}/osbuild-composer/repositories/ - %endif + %else + %if 0%{?rhel} -# RHEL 9 supports building for RHEL 8 and later -%if 0%{?rhel} >= 9 +# RHEL 10 supports building all RHEL versions +%if 0%{?rhel} >= 10 install -m 0644 -vp repositories/rhel-* %{buildroot}%{_datadir}/osbuild-composer/repositories/ %else -# RHEL 8 only supports building for 8 +# All other RHEL versions support building for the same version install -m 0644 -vp repositories/rhel-%{rhel}* %{buildroot}%{_datadir}/osbuild-composer/repositories/ +# RHEL 9 supports building also for RHEL 8 +%if 0%{?rhel} == 9 +install -m 0644 -vp repositories/rhel-8* %{buildroot}%{_datadir}/osbuild-composer/repositories/ +%endif + %endif %endif %endif @@ -328,6 +342,7 @@ The worker for osbuild-composer %files worker %{_libexecdir}/osbuild-composer/osbuild-worker +%{_libexecdir}/osbuild-composer/osbuild-worker-executor %{_libexecdir}/osbuild-composer/osbuild-jobsite-manager %{_libexecdir}/osbuild-composer/osbuild-jobsite-builder %{_unitdir}/osbuild-worker@.service @@ -395,7 +410,11 @@ Requires: httpd Requires: mod_ssl Requires: openssl Requires: firewalld +# podman-plugins has been deprecated since podman version 5.0.0, +# which is in Fedora 40+ and in c10s / el10 +%if (0%{?rhel} && 0%{?rhel} < 10) || (0%{?fedora} && 0%{?fedora} < 40) Requires: podman-plugins +%endif Requires: dnf-plugins-core Requires: skopeo Requires: make @@ -422,6 +441,9 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c %endif %changelog +* Wed Jun 12 2024 imagebuilder-bot - 110-1 +- New upstream release + * Tue Jun 04 2024 imagebuilder-bot - 109-1 - New upstream release diff --git a/sources b/sources index ab20247..10ff2b4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osbuild-composer-109.tar.gz) = 0c84cda4265fc5e77cc1906ce0d2fbded32061abcfd00cafab301e7c9edce75b031facabf2f301e6b57ab695168626d9e1651aae10929584fabc66734f3edd56 +SHA512 (osbuild-composer-110.tar.gz) = 9b478221c502ff3a178507b840d2aab96521a46120e7f6367e4c75c892fbda164a4cc672c1511b96924271434978423610da422dc1a0d5d6b9652be3a0216b49