import osbuild-composer-28-1.el8
This commit is contained in:
CentOS Sources
Stepan Oksanichenko
parent
a3b7642754
commit
2023d346aa
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
|||||||
SOURCES/osbuild-composer-16.tar.gz
|
SOURCES/osbuild-composer-28.tar.gz
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
afea68a426c02a93b7a21d3d06171523161be521 SOURCES/osbuild-composer-16.tar.gz
|
c3d736a5c9b9bdd26f4eb40e25bf2c1c8bafd5a4 SOURCES/osbuild-composer-28.tar.gz
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
%global goipath github.com/osbuild/osbuild-composer
|
%global goipath github.com/osbuild/osbuild-composer
|
||||||
|
|
||||||
Version: 16
|
Version: 28
|
||||||
|
|
||||||
%gometa
|
%gometa
|
||||||
|
|
||||||
@ -30,6 +30,9 @@ Source0: %{gosource}
|
|||||||
|
|
||||||
BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
|
BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
|
||||||
BuildRequires: systemd
|
BuildRequires: systemd
|
||||||
|
BuildRequires: krb5-devel
|
||||||
|
BuildRequires: python3-docutils
|
||||||
|
BuildRequires: make
|
||||||
%if 0%{?fedora}
|
%if 0%{?fedora}
|
||||||
BuildRequires: systemd-rpm-macros
|
BuildRequires: systemd-rpm-macros
|
||||||
BuildRequires: git
|
BuildRequires: git
|
||||||
@ -39,30 +42,45 @@ BuildRequires: golang(github.com/Azure/azure-storage-blob-go/azblob)
|
|||||||
BuildRequires: golang(github.com/BurntSushi/toml)
|
BuildRequires: golang(github.com/BurntSushi/toml)
|
||||||
BuildRequires: golang(github.com/coreos/go-semver/semver)
|
BuildRequires: golang(github.com/coreos/go-semver/semver)
|
||||||
BuildRequires: golang(github.com/coreos/go-systemd/activation)
|
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/google/uuid)
|
BuildRequires: golang(github.com/google/uuid)
|
||||||
BuildRequires: golang(github.com/julienschmidt/httprouter)
|
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/gobwas/glob)
|
||||||
BuildRequires: golang(github.com/google/go-cmp/cmp)
|
BuildRequires: golang(github.com/google/go-cmp/cmp)
|
||||||
BuildRequires: golang(github.com/gophercloud/gophercloud)
|
BuildRequires: golang(github.com/gophercloud/gophercloud)
|
||||||
BuildRequires: golang(github.com/stretchr/testify/assert)
|
BuildRequires: golang(github.com/stretchr/testify/assert)
|
||||||
|
BuildRequires: golang(github.com/ubccr/kerby)
|
||||||
|
BuildRequires: golang(github.com/vmware/govmomi)
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
Requires: %{name}-core = %{version}-%{release}
|
||||||
Requires: %{name}-worker = %{version}-%{release}
|
Requires: %{name}-worker = %{version}-%{release}
|
||||||
Requires: systemd
|
Requires: systemd
|
||||||
Requires: osbuild >= 17
|
|
||||||
Requires: osbuild-ostree >= 17
|
|
||||||
|
|
||||||
Provides: weldr
|
Provides: weldr
|
||||||
|
|
||||||
%if 0%{?rhel}
|
%if 0%{?rhel}
|
||||||
Obsoletes: lorax-composer <= 28
|
Obsoletes: lorax-composer <= 29
|
||||||
Conflicts: lorax-composer
|
Conflicts: lorax-composer
|
||||||
%endif
|
%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 in F34
|
# remove in F34
|
||||||
Obsoletes: golang-github-osbuild-composer < %{version}-%{release}
|
Obsoletes: golang-github-osbuild-composer < %{version}-%{release}
|
||||||
Provides: golang-github-osbuild-composer = %{version}-%{release}
|
Provides: golang-github-osbuild-composer = %{version}-%{release}
|
||||||
|
|
||||||
|
# remove when F34 is EOL
|
||||||
|
Obsoletes: osbuild-composer-koji <= 23
|
||||||
|
|
||||||
%description
|
%description
|
||||||
%{common_description}
|
%{common_description}
|
||||||
|
|
||||||
@ -73,6 +91,22 @@ Provides: golang-github-osbuild-composer = %{version}-%{release}
|
|||||||
%goprep
|
%goprep
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%if 0%{?fedora} && 0%{?fedora} <= 32
|
||||||
|
# Fedora 32 and older ships different kolo/xmlrpc and azure/azblob APIs. We
|
||||||
|
# cannot specify build tags in gobuild macro because the macro itself
|
||||||
|
# specifies build tags and -tags argument cannot be used more than once.
|
||||||
|
# Therefore, this ugly hack with build tags switcharoo is required.
|
||||||
|
# Remove when F32 is EOL.
|
||||||
|
|
||||||
|
# Remove the build constraint from the wrappers of the old APIs
|
||||||
|
sed -i "s$// +build kolo_xmlrpc_oldapi$// +build !kolo_xmlrpc_oldapi$" internal/upload/koji/xmlrpc-response-oldapi.go
|
||||||
|
sed -i "s$// +build azblob_oldapi$// +build !azblob_oldapi$" internal/upload/azure/page_blob_url_oldapi.go
|
||||||
|
|
||||||
|
# Add a build constraint to the wrappers of the new APIs
|
||||||
|
sed -i "s$// +build !kolo_xmlrpc_oldapi$// +build kolo_xmlrpc_oldapi$" internal/upload/koji/xmlrpc-response.go
|
||||||
|
sed -i "s$// +build !azblob_oldapi$// +build azblob_oldapi$" internal/upload/azure/page_blob_url.go
|
||||||
|
%endif
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%if 0%{?rhel}
|
%if 0%{?rhel}
|
||||||
GO_BUILD_PATH=$PWD/_build
|
GO_BUILD_PATH=$PWD/_build
|
||||||
@ -88,6 +122,7 @@ export GOFLAGS=-mod=vendor
|
|||||||
%gobuild -o _bin/osbuild-composer %{goipath}/cmd/osbuild-composer
|
%gobuild -o _bin/osbuild-composer %{goipath}/cmd/osbuild-composer
|
||||||
%gobuild -o _bin/osbuild-worker %{goipath}/cmd/osbuild-worker
|
%gobuild -o _bin/osbuild-worker %{goipath}/cmd/osbuild-worker
|
||||||
|
|
||||||
|
make man
|
||||||
|
|
||||||
%if %{with tests} || 0%{?rhel}
|
%if %{with tests} || 0%{?rhel}
|
||||||
|
|
||||||
@ -104,51 +139,91 @@ export GOPATH=%{gobuilddir}:%{gopath}
|
|||||||
|
|
||||||
TEST_LDFLAGS="${LDFLAGS:-} -B 0x$(od -N 20 -An -tx1 -w100 /dev/urandom | tr -d ' ')"
|
TEST_LDFLAGS="${LDFLAGS:-} -B 0x$(od -N 20 -An -tx1 -w100 /dev/urandom | tr -d ' ')"
|
||||||
|
|
||||||
go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-tests %{goipath}/cmd/osbuild-tests
|
go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-composer-cli-tests %{goipath}/cmd/osbuild-composer-cli-tests
|
||||||
go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-dnf-json-tests %{goipath}/cmd/osbuild-dnf-json-tests
|
go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-dnf-json-tests %{goipath}/cmd/osbuild-dnf-json-tests
|
||||||
go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-weldr-tests %{goipath}/internal/client/
|
go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-weldr-tests %{goipath}/internal/client/
|
||||||
go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-rcm-tests %{goipath}/cmd/osbuild-rcm-tests
|
|
||||||
go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-image-tests %{goipath}/cmd/osbuild-image-tests
|
go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-image-tests %{goipath}/cmd/osbuild-image-tests
|
||||||
|
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 build -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/cloud-cleaner %{goipath}/cmd/cloud-cleaner
|
||||||
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%install
|
%install
|
||||||
install -m 0755 -vd %{buildroot}%{_libexecdir}/osbuild-composer
|
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-composer %{buildroot}%{_libexecdir}/osbuild-composer/
|
||||||
install -m 0755 -vp _bin/osbuild-worker %{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 dnf-json %{buildroot}%{_libexecdir}/osbuild-composer/
|
||||||
|
|
||||||
install -m 0755 -vd %{buildroot}%{_datadir}/osbuild-composer/repositories
|
install -m 0755 -vd %{buildroot}%{_datadir}/osbuild-composer/repositories
|
||||||
install -m 0644 -vp repositories/* %{buildroot}%{_datadir}/osbuild-composer/repositories/
|
install -m 0644 -vp repositories/* %{buildroot}%{_datadir}/osbuild-composer/repositories/
|
||||||
|
|
||||||
install -m 0755 -vd %{buildroot}%{_unitdir}
|
install -m 0755 -vd %{buildroot}%{_unitdir}
|
||||||
install -m 0644 -vp distribution/*.{service,socket} %{buildroot}%{_unitdir}/
|
install -m 0644 -vp distribution/*.{service,socket} %{buildroot}%{_unitdir}/
|
||||||
|
|
||||||
install -m 0755 -vd %{buildroot}%{_sysusersdir}
|
install -m 0755 -vd %{buildroot}%{_sysusersdir}
|
||||||
install -m 0644 -vp distribution/osbuild-composer.conf %{buildroot}%{_sysusersdir}/
|
install -m 0644 -vp distribution/osbuild-composer.conf %{buildroot}%{_sysusersdir}/
|
||||||
|
|
||||||
install -m 0755 -vd %{buildroot}%{_localstatedir}/cache/osbuild-composer/dnf-cache
|
install -m 0755 -vd %{buildroot}%{_localstatedir}/cache/osbuild-composer/dnf-cache
|
||||||
|
|
||||||
|
install -m 0755 -vd %{buildroot}%{_mandir}/man7
|
||||||
|
install -m 0644 -vp docs/*.7 %{buildroot}%{_mandir}/man7/
|
||||||
|
|
||||||
%if %{with tests} || 0%{?rhel}
|
%if %{with tests} || 0%{?rhel}
|
||||||
|
|
||||||
install -m 0755 -vd %{buildroot}%{_libexecdir}/tests/osbuild-composer
|
install -m 0755 -vd %{buildroot}%{_libexecdir}/osbuild-composer-test
|
||||||
install -m 0755 -vp _bin/osbuild-tests %{buildroot}%{_libexecdir}/tests/osbuild-composer/
|
install -m 0755 -vp _bin/osbuild-composer-cli-tests %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
||||||
install -m 0755 -vp _bin/osbuild-weldr-tests %{buildroot}%{_libexecdir}/tests/osbuild-composer/
|
install -m 0755 -vp _bin/osbuild-weldr-tests %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
||||||
install -m 0755 -vp _bin/osbuild-dnf-json-tests %{buildroot}%{_libexecdir}/tests/osbuild-composer/
|
install -m 0755 -vp _bin/osbuild-dnf-json-tests %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
||||||
install -m 0755 -vp _bin/osbuild-image-tests %{buildroot}%{_libexecdir}/tests/osbuild-composer/
|
install -m 0755 -vp _bin/osbuild-image-tests %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
||||||
install -m 0755 -vp _bin/osbuild-rcm-tests %{buildroot}%{_libexecdir}/tests/osbuild-composer/
|
install -m 0755 -vp _bin/osbuild-auth-tests %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
||||||
install -m 0755 -vp tools/image-info %{buildroot}%{_libexecdir}/osbuild-composer/
|
install -m 0755 -vp _bin/osbuild-koji-tests %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
||||||
|
install -m 0755 -vp _bin/cloud-cleaner %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
||||||
|
install -m 0755 -vp tools/provision.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
||||||
|
install -m 0755 -vp tools/gen-certs.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
||||||
|
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/libvirt_test.sh %{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 -vd %{buildroot}%{_datadir}/tests/osbuild-composer
|
install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/ansible
|
||||||
install -m 0644 -vp test/azure-deployment-template.json %{buildroot}%{_datadir}/tests/osbuild-composer/
|
install -m 0644 -vp test/data/ansible/* %{buildroot}%{_datadir}/tests/osbuild-composer/ansible/
|
||||||
|
|
||||||
install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/cases
|
install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/azure
|
||||||
install -m 0644 -vp test/cases/* %{buildroot}%{_datadir}/tests/osbuild-composer/cases/
|
install -m 0644 -vp test/data/azure/* %{buildroot}%{_datadir}/tests/osbuild-composer/azure/
|
||||||
install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/keyring
|
|
||||||
install -m 0600 -vp test/keyring/* %{buildroot}%{_datadir}/tests/osbuild-composer/keyring/
|
|
||||||
|
|
||||||
install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/cloud-init
|
install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/manifests
|
||||||
install -m 0644 -vp test/cloud-init/* %{buildroot}%{_datadir}/tests/osbuild-composer/cloud-init/
|
install -m 0644 -vp test/data/manifests/* %{buildroot}%{_datadir}/tests/osbuild-composer/manifests/
|
||||||
|
|
||||||
|
install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/cloud-init
|
||||||
|
install -m 0644 -vp test/data/cloud-init/* %{buildroot}%{_datadir}/tests/osbuild-composer/cloud-init/
|
||||||
|
|
||||||
|
install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/composer
|
||||||
|
install -m 0644 -vp test/data/composer/* %{buildroot}%{_datadir}/tests/osbuild-composer/composer/
|
||||||
|
|
||||||
|
install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/repositories
|
||||||
|
install -m 0644 -vp test/data/repositories/* %{buildroot}%{_datadir}/tests/osbuild-composer/repositories/
|
||||||
|
|
||||||
|
install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/kerberos
|
||||||
|
install -m 0644 -vp test/data/kerberos/* %{buildroot}%{_datadir}/tests/osbuild-composer/kerberos/
|
||||||
|
|
||||||
|
install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/keyring
|
||||||
|
install -m 0644 -vp test/data/keyring/id_rsa.pub %{buildroot}%{_datadir}/tests/osbuild-composer/keyring/
|
||||||
|
install -m 0600 -vp test/data/keyring/id_rsa %{buildroot}%{_datadir}/tests/osbuild-composer/keyring/
|
||||||
|
|
||||||
|
install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/koji
|
||||||
|
install -m 0644 -vp test/data/koji/* %{buildroot}%{_datadir}/tests/osbuild-composer/koji/
|
||||||
|
|
||||||
|
install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/x509
|
||||||
|
install -m 0644 -vp test/data/x509/* %{buildroot}%{_datadir}/tests/osbuild-composer/x509/
|
||||||
|
|
||||||
|
%if 0%{?rhel}
|
||||||
|
install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/vendor
|
||||||
|
install -m 0644 -vp test/data/vendor/87-podman-bridge.conflist %{buildroot}%{_datadir}/tests/osbuild-composer/vendor/
|
||||||
|
install -m 0755 -vp test/data/vendor/dnsname %{buildroot}%{_datadir}/tests/osbuild-composer/vendor/
|
||||||
|
%endif
|
||||||
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -156,58 +231,50 @@ install -m 0644 -vp test/cloud-init/* %{buildroot}%{_datad
|
|||||||
%if 0%{?rhel}
|
%if 0%{?rhel}
|
||||||
export GOFLAGS=-mod=vendor
|
export GOFLAGS=-mod=vendor
|
||||||
export GOPATH=$PWD/_build:%{gopath}
|
export GOPATH=$PWD/_build:%{gopath}
|
||||||
|
# cd inside GOPATH, otherwise go with GO111MODULE=off ignores vendor directory
|
||||||
|
cd $PWD/_build/src/%{goipath}
|
||||||
%gotest ./...
|
%gotest ./...
|
||||||
%else
|
%else
|
||||||
%gocheck
|
%gocheck
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%post
|
%post
|
||||||
%systemd_post osbuild-composer.service osbuild-composer.socket osbuild-remote-worker.socket
|
%systemd_post osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-remote-worker.socket
|
||||||
|
|
||||||
%preun
|
%preun
|
||||||
%systemd_preun osbuild-composer.service osbuild-composer.socket osbuild-remote-worker.socket
|
%systemd_preun osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-remote-worker.socket
|
||||||
|
|
||||||
%postun
|
%postun
|
||||||
%systemd_postun_with_restart osbuild-composer.service osbuild-composer.socket osbuild-remote-worker.socket
|
%systemd_postun_with_restart osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-remote-worker.socket
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%license LICENSE
|
%license LICENSE
|
||||||
%doc README.md
|
%doc README.md
|
||||||
%{_libexecdir}/osbuild-composer/osbuild-composer
|
%{_mandir}/man7/%{name}.7*
|
||||||
%{_libexecdir}/osbuild-composer/dnf-json
|
|
||||||
%{_datadir}/osbuild-composer/
|
|
||||||
%{_unitdir}/osbuild-composer.service
|
%{_unitdir}/osbuild-composer.service
|
||||||
%{_unitdir}/osbuild-composer.socket
|
%{_unitdir}/osbuild-composer.socket
|
||||||
|
%{_unitdir}/osbuild-composer-api.socket
|
||||||
|
%{_unitdir}/osbuild-local-worker.socket
|
||||||
%{_unitdir}/osbuild-remote-worker.socket
|
%{_unitdir}/osbuild-remote-worker.socket
|
||||||
%{_sysusersdir}/osbuild-composer.conf
|
%{_sysusersdir}/osbuild-composer.conf
|
||||||
|
|
||||||
%package rcm
|
%package core
|
||||||
Summary: RCM-specific version of osbuild-composer
|
Summary: The core osbuild-composer binary
|
||||||
Requires: %{name} = %{version}-%{release}
|
|
||||||
|
|
||||||
# remove in F34
|
%description core
|
||||||
Obsoletes: golang-github-osbuild-composer-rcm < %{version}-%{release}
|
The core osbuild-composer binary. This is suitable both for spawning in containers and by systemd.
|
||||||
Provides: golang-github-osbuild-composer-rcm = %{version}-%{release}
|
|
||||||
|
|
||||||
%description rcm
|
%files core
|
||||||
RCM-specific version of osbuild-composer not intended for public usage.
|
%{_libexecdir}/osbuild-composer/osbuild-composer
|
||||||
|
%{_libexecdir}/osbuild-composer/dnf-json
|
||||||
%files rcm
|
%{_datadir}/osbuild-composer/
|
||||||
%{_unitdir}/osbuild-rcm.socket
|
|
||||||
|
|
||||||
%post rcm
|
|
||||||
%systemd_post osbuild-rcm.socket
|
|
||||||
|
|
||||||
%preun rcm
|
|
||||||
%systemd_preun osbuild-rcm.socket
|
|
||||||
|
|
||||||
%postun rcm
|
|
||||||
%systemd_postun_with_restart osbuild-rcm.socket
|
|
||||||
|
|
||||||
%package worker
|
%package worker
|
||||||
Summary: The worker for osbuild-composer
|
Summary: The worker for osbuild-composer
|
||||||
Requires: systemd
|
Requires: systemd
|
||||||
Requires: osbuild
|
Requires: qemu-img
|
||||||
|
Requires: osbuild >= 24
|
||||||
|
Requires: osbuild-ostree >= 24
|
||||||
|
|
||||||
# remove in F34
|
# remove in F34
|
||||||
Obsoletes: golang-github-osbuild-composer-worker < %{version}-%{release}
|
Obsoletes: golang-github-osbuild-composer-worker < %{version}-%{release}
|
||||||
@ -242,11 +309,46 @@ systemctl stop "osbuild-worker@*.service" "osbuild-remote-worker@*.service"
|
|||||||
%package tests
|
%package tests
|
||||||
Summary: Integration tests
|
Summary: Integration tests
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name} = %{version}-%{release}
|
||||||
Requires: %{name}-rcm = %{version}-%{release}
|
|
||||||
Requires: composer-cli
|
Requires: composer-cli
|
||||||
Requires: createrepo_c
|
Requires: createrepo_c
|
||||||
Requires: genisoimage
|
Requires: genisoimage
|
||||||
Requires: qemu-kvm-core
|
Requires: qemu-kvm-core
|
||||||
|
Requires: systemd-container
|
||||||
|
Requires: jq
|
||||||
|
Requires: unzip
|
||||||
|
Requires: container-selinux
|
||||||
|
Requires: dnsmasq
|
||||||
|
Requires: krb5-workstation
|
||||||
|
Requires: podman
|
||||||
|
Requires: python3
|
||||||
|
Requires: sssd-krb5
|
||||||
|
Requires: libvirt-client libvirt-daemon
|
||||||
|
Requires: libvirt-daemon-config-network
|
||||||
|
Requires: libvirt-daemon-config-nwfilter
|
||||||
|
Requires: libvirt-daemon-driver-interface
|
||||||
|
Requires: libvirt-daemon-driver-network
|
||||||
|
Requires: libvirt-daemon-driver-nodedev
|
||||||
|
Requires: libvirt-daemon-driver-nwfilter
|
||||||
|
Requires: libvirt-daemon-driver-qemu
|
||||||
|
Requires: libvirt-daemon-driver-secret
|
||||||
|
Requires: libvirt-daemon-driver-storage
|
||||||
|
Requires: libvirt-daemon-driver-storage-disk
|
||||||
|
Requires: libvirt-daemon-kvm
|
||||||
|
Requires: qemu-img
|
||||||
|
Requires: qemu-kvm
|
||||||
|
Requires: virt-install
|
||||||
|
Requires: expect
|
||||||
|
Requires: python3-lxml
|
||||||
|
Requires: httpd
|
||||||
|
Requires: openssl
|
||||||
|
%if 0%{?fedora}
|
||||||
|
Requires: podman-plugins
|
||||||
|
# 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
|
||||||
|
# packages manually.
|
||||||
|
Requires: koji
|
||||||
|
Requires: ansible
|
||||||
|
%endif
|
||||||
%ifarch %{arm}
|
%ifarch %{arm}
|
||||||
Requires: edk2-aarch64
|
Requires: edk2-aarch64
|
||||||
%endif
|
%endif
|
||||||
@ -255,13 +357,39 @@ Requires: edk2-aarch64
|
|||||||
Integration tests to be run on a pristine-dedicated system to test the osbuild-composer package.
|
Integration tests to be run on a pristine-dedicated system to test the osbuild-composer package.
|
||||||
|
|
||||||
%files tests
|
%files tests
|
||||||
|
%{_libexecdir}/osbuild-composer-test/
|
||||||
%{_libexecdir}/tests/osbuild-composer/
|
%{_libexecdir}/tests/osbuild-composer/
|
||||||
%{_datadir}/tests/osbuild-composer/
|
%{_datadir}/tests/osbuild-composer/
|
||||||
%{_libexecdir}/osbuild-composer/image-info
|
|
||||||
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Feb 20 2021 Martin Sehnoutka <msehnout@redhat.com> - 28-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Fri Feb 05 2021 Ondrej Budai <obudai@redhat.com> - 27-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Thu Dec 17 2020 Ondrej Budai <obudai@redhat.com> - 26-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Mon Nov 30 2020 Ondrej Budai <obudai@redhat.com> - 25-1
|
||||||
|
- New upstream release 25 (rhbz#1883481)
|
||||||
|
|
||||||
|
* Thu Sep 03 2020 Tom Gundersen <tgunders@redhat.com> - 20.1-1
|
||||||
|
- New upstream release 20.1 (rhbz#1872370)
|
||||||
|
|
||||||
|
* Sun Aug 23 2020 Tom Gundersen <tgunders@redhat.com> - 20-1
|
||||||
|
- New upstream release 20 (rhbz#1871184 and rhbz#1871179)
|
||||||
|
|
||||||
|
* Thu Aug 13 2020 Tom Gundersen <tgunders@redhat.com> - 19-1
|
||||||
|
- New upstream release 19 (rhbz#1866015 and rhbz#1866013)
|
||||||
|
|
||||||
|
* Thu Jul 09 2020 Ondrej Budai <obudai@redhat.com> - 17-1
|
||||||
|
- New upstream release 17 (rhbz#1831653)
|
||||||
|
- Obsolete lorax-composer in favor of osbuild-composer (rhbz#1836844)
|
||||||
|
|
||||||
* Mon Jun 29 2020 Ondrej Budai <obudai@redhat.com> - 16-1
|
* Mon Jun 29 2020 Ondrej Budai <obudai@redhat.com> - 16-1
|
||||||
- New upstream release 16 (rhbz#1831653)
|
- New upstream release 16 (rhbz#1831653)
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user