|
|
|
|
@ -9,7 +9,7 @@
|
|
|
|
|
|
|
|
|
|
%global goipath github.com/osbuild/osbuild-composer
|
|
|
|
|
|
|
|
|
|
Version: 46.3
|
|
|
|
|
Version: 75
|
|
|
|
|
|
|
|
|
|
%gometa
|
|
|
|
|
|
|
|
|
|
@ -29,7 +29,7 @@ Summary: An image building service based on osbuild
|
|
|
|
|
ExcludeArch: i686 armv7hl
|
|
|
|
|
|
|
|
|
|
# Upstream license specification: Apache-2.0
|
|
|
|
|
License: ASL 2.0
|
|
|
|
|
License: Apache-2.0
|
|
|
|
|
URL: %{gourl}
|
|
|
|
|
Source0: %{gosource}
|
|
|
|
|
|
|
|
|
|
@ -39,36 +39,15 @@ BuildRequires: systemd
|
|
|
|
|
BuildRequires: krb5-devel
|
|
|
|
|
BuildRequires: python3-docutils
|
|
|
|
|
BuildRequires: make
|
|
|
|
|
# Build requirements of 'theproglottis/gpgme' package
|
|
|
|
|
BuildRequires: gpgme-devel
|
|
|
|
|
BuildRequires: libassuan-devel
|
|
|
|
|
%if 0%{?fedora}
|
|
|
|
|
BuildRequires: systemd-rpm-macros
|
|
|
|
|
BuildRequires: git
|
|
|
|
|
BuildRequires: golang(github.com/aws/aws-sdk-go)
|
|
|
|
|
BuildRequires: golang(github.com/Azure/azure-sdk-for-go)
|
|
|
|
|
BuildRequires: golang(github.com/Azure/azure-storage-blob-go/azblob)
|
|
|
|
|
BuildRequires: golang(github.com/BurntSushi/toml)
|
|
|
|
|
BuildRequires: golang(github.com/coreos/go-semver/semver)
|
|
|
|
|
BuildRequires: golang(github.com/coreos/go-systemd/activation)
|
|
|
|
|
BuildRequires: golang(github.com/deepmap/oapi-codegen/pkg/codegen)
|
|
|
|
|
BuildRequires: golang(github.com/go-chi/chi)
|
|
|
|
|
BuildRequires: golang(github.com/golang-jwt/jwt)
|
|
|
|
|
BuildRequires: golang(github.com/google/uuid)
|
|
|
|
|
BuildRequires: golang(github.com/jackc/pgx/v4)
|
|
|
|
|
BuildRequires: golang(github.com/julienschmidt/httprouter)
|
|
|
|
|
BuildRequires: golang(github.com/getkin/kin-openapi/openapi3)
|
|
|
|
|
BuildRequires: golang(github.com/kolo/xmlrpc)
|
|
|
|
|
BuildRequires: golang(github.com/labstack/echo/v4)
|
|
|
|
|
BuildRequires: golang(github.com/gobwas/glob)
|
|
|
|
|
BuildRequires: golang(github.com/google/go-cmp/cmp)
|
|
|
|
|
BuildRequires: golang(github.com/gophercloud/gophercloud)
|
|
|
|
|
BuildRequires: golang(github.com/prometheus/client_golang/prometheus/promhttp)
|
|
|
|
|
BuildRequires: golang(github.com/openshift-online/ocm-sdk-go)
|
|
|
|
|
BuildRequires: golang(github.com/segmentio/ksuid)
|
|
|
|
|
BuildRequires: golang(github.com/stretchr/testify/assert)
|
|
|
|
|
BuildRequires: golang(github.com/ubccr/kerby)
|
|
|
|
|
BuildRequires: golang(github.com/vmware/govmomi)
|
|
|
|
|
BuildRequires: golang(github.com/oracle/oci-go-sdk/v54)
|
|
|
|
|
BuildRequires: golang(cloud.google.com/go)
|
|
|
|
|
BuildRequires: golang(gopkg.in/ini.v1)
|
|
|
|
|
# DO NOT REMOVE the BUNDLE_START and BUNDLE_END markers as they are used by 'tools/rpm_spec_add_provides_bundle.sh' to generate the Provides: bundled list
|
|
|
|
|
# BUNDLE_START
|
|
|
|
|
# BUNDLE_END
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
Requires: %{name}-core = %{version}-%{release}
|
|
|
|
|
@ -77,20 +56,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
|
|
|
|
|
|
|
|
|
|
# remove when F34 is EOL
|
|
|
|
|
Obsoletes: osbuild-composer-koji <= 23
|
|
|
|
|
|
|
|
|
|
%description
|
|
|
|
|
%{common_description}
|
|
|
|
|
|
|
|
|
|
@ -98,7 +63,7 @@ Obsoletes: osbuild-composer-koji <= 23
|
|
|
|
|
%if 0%{?rhel}
|
|
|
|
|
%forgeautosetup -p1
|
|
|
|
|
%else
|
|
|
|
|
%goprep
|
|
|
|
|
%goprep -k
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%build
|
|
|
|
|
@ -150,7 +115,7 @@ go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-auth-tes
|
|
|
|
|
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 build -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/cloud-cleaner %{goipath}/cmd/cloud-cleaner
|
|
|
|
|
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
|
|
|
|
|
|
|
|
|
|
%endif
|
|
|
|
|
@ -216,7 +181,7 @@ install -m 0755 -vp _bin/osbuild-auth-tests %{buildroot}%
|
|
|
|
|
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/cloud-cleaner %{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/
|
|
|
|
|
install -m 0755 -vp tools/provision.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
|
|
|
|
@ -225,12 +190,21 @@ install -m 0755 -vp tools/gen-ssh.sh %{buildroot}%
|
|
|
|
|
install -m 0755 -vp tools/image-info %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
|
|
|
|
install -m 0755 -vp tools/run-koji-container.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
|
|
|
|
install -m 0755 -vp tools/koji-compose.py %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
|
|
|
|
install -m 0755 -vp tools/koji-compose-v2.py %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
|
|
|
|
install -m 0755 -vp tools/libvirt_test.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
|
|
|
|
install -m 0755 -vp tools/s3_test.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
|
|
|
|
install -m 0755 -vp tools/generic_s3_test.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
|
|
|
|
install -m 0755 -vp tools/generic_s3_https_test.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
|
|
|
|
install -m 0755 -vp tools/run-mock-auth-servers.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
|
|
|
|
install -m 0755 -vp tools/set-env-variables.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
|
|
|
|
install -m 0755 -vp tools/test-case-generators/generate-test-cases %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
|
|
|
|
install -m 0755 -vd %{buildroot}%{_libexecdir}/tests/osbuild-composer
|
|
|
|
|
install -m 0755 -vp test/cases/* %{buildroot}%{_libexecdir}/tests/osbuild-composer/
|
|
|
|
|
install -m 0755 -vp test/cases/*.sh %{buildroot}%{_libexecdir}/tests/osbuild-composer/
|
|
|
|
|
|
|
|
|
|
install -m 0755 -vd %{buildroot}%{_libexecdir}/tests/osbuild-composer/api
|
|
|
|
|
install -m 0755 -vp test/cases/api/*.sh %{buildroot}%{_libexecdir}/tests/osbuild-composer/api/
|
|
|
|
|
|
|
|
|
|
install -m 0755 -vd %{buildroot}%{_libexecdir}/tests/osbuild-composer/api/common
|
|
|
|
|
install -m 0755 -vp test/cases/api/common/*.sh %{buildroot}%{_libexecdir}/tests/osbuild-composer/api/common/
|
|
|
|
|
|
|
|
|
|
install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/ansible
|
|
|
|
|
install -m 0644 -vp test/data/ansible/* %{buildroot}%{_datadir}/tests/osbuild-composer/ansible/
|
|
|
|
|
@ -266,11 +240,8 @@ install -m 0644 -vp test/data/koji/* %{buildroot}%
|
|
|
|
|
install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/x509
|
|
|
|
|
install -m 0644 -vp test/data/x509/* %{buildroot}%{_datadir}/tests/osbuild-composer/x509/
|
|
|
|
|
|
|
|
|
|
install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/openshift
|
|
|
|
|
install -m 0644 -vp test/data/openshift/* %{buildroot}%{_datadir}/tests/osbuild-composer/openshift/
|
|
|
|
|
|
|
|
|
|
install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/schemas
|
|
|
|
|
install -m 0644 -vp internal/jobqueue/dbjobqueue/schemas/* %{buildroot}%{_datadir}/tests/osbuild-composer/schemas/
|
|
|
|
|
install -m 0644 -vp pkg/jobqueue/dbjobqueue/schemas/* %{buildroot}%{_datadir}/tests/osbuild-composer/schemas/
|
|
|
|
|
|
|
|
|
|
install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/upgrade8to9
|
|
|
|
|
install -m 0644 -vp test/data/upgrade8to9/* %{buildroot}%{_datadir}/tests/osbuild-composer/upgrade8to9/
|
|
|
|
|
@ -324,16 +295,12 @@ 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 >= 49
|
|
|
|
|
Requires: osbuild-ostree >= 49
|
|
|
|
|
Requires: osbuild-lvm2 >= 49
|
|
|
|
|
Requires: osbuild-luks2 >= 49
|
|
|
|
|
Requires: osbuild >= 80
|
|
|
|
|
Requires: osbuild-ostree >= 80
|
|
|
|
|
Requires: osbuild-lvm2 >= 80
|
|
|
|
|
Requires: osbuild-luks2 >= 80
|
|
|
|
|
Requires: %{name}-dnf-json = %{version}-%{release}
|
|
|
|
|
|
|
|
|
|
# remove in F34
|
|
|
|
|
Obsoletes: golang-github-osbuild-composer-worker < %{version}-%{release}
|
|
|
|
|
Provides: golang-github-osbuild-composer-worker = %{version}-%{release}
|
|
|
|
|
|
|
|
|
|
%description worker
|
|
|
|
|
The worker for osbuild-composer
|
|
|
|
|
|
|
|
|
|
@ -348,8 +315,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:
|
|
|
|
|
if [ -d /run/systemd/system ]; then
|
|
|
|
|
# The following lines mimicks its behaviour by running two commands.
|
|
|
|
|
# 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"
|
|
|
|
|
@ -363,7 +331,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
|
|
|
|
|
@ -371,8 +339,12 @@ The dnf-json binary used by osbuild-composer and the workers.
|
|
|
|
|
|
|
|
|
|
%files dnf-json
|
|
|
|
|
%{_libexecdir}/osbuild-composer/dnf-json
|
|
|
|
|
%{_unitdir}/osbuild-dnf-json.service
|
|
|
|
|
%{_unitdir}/osbuild-dnf-json.socket
|
|
|
|
|
|
|
|
|
|
%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}
|
|
|
|
|
|
|
|
|
|
@ -418,12 +390,11 @@ Requires: httpd
|
|
|
|
|
Requires: mod_ssl
|
|
|
|
|
Requires: openssl
|
|
|
|
|
Requires: firewalld
|
|
|
|
|
# see https://bugzilla.redhat.com/show_bug.cgi?id=1986333
|
|
|
|
|
%if 0%{?rhel} && 0%{?rhel} != 9
|
|
|
|
|
Requires: podman-plugins
|
|
|
|
|
%endif
|
|
|
|
|
Requires: dnf-plugins-core
|
|
|
|
|
Requires: skopeo
|
|
|
|
|
Requires: make
|
|
|
|
|
Requires: python3-pip
|
|
|
|
|
%if 0%{?fedora}
|
|
|
|
|
# koji and ansible are not in RHEL repositories. Depending on them breaks RHEL
|
|
|
|
|
# gating (see OSCI-1541). The test script must enable EPEL and install those
|
|
|
|
|
@ -446,10 +417,58 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
|
* Thu Apr 28 2022 Ondřej Budai <ondrej@budai.cz> - 46.3-1
|
|
|
|
|
* Wed Feb 22 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 75-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
* Fri Apr 01 2022 Simon Steinbeiss <simon.steinbeiss@redhat.com> - 46.1-1
|
|
|
|
|
* 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
|
|
|
|
|
|
|
|
|
|
* 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
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
* Wed Aug 24 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 60-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
* 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
|
|
|
|
|
|
|
|
|
|
* 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
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
* Wed Jun 01 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 54-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
* 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
|
|
|
|
|
|
|
|
|
|
* Tue Mar 01 2022 Ondřej Budai <ondrej@budai.cz> - 46-1
|
|
|
|
|
|
CentOS Sources