|
|
@ -9,7 +9,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
%global goipath github.com/osbuild/osbuild-composer
|
|
|
|
%global goipath github.com/osbuild/osbuild-composer
|
|
|
|
|
|
|
|
|
|
|
|
Version: 75
|
|
|
|
Version: 88
|
|
|
|
|
|
|
|
|
|
|
|
%gometa
|
|
|
|
%gometa
|
|
|
|
|
|
|
|
|
|
|
@ -114,7 +114,6 @@ go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-image-te
|
|
|
|
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-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 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-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 test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-service-maintenance-tests %{goipath}/cmd/osbuild-service-maintenance
|
|
|
|
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
|
|
|
|
go build -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-mock-openid-provider %{goipath}/cmd/osbuild-mock-openid-provider
|
|
|
|
|
|
|
|
|
|
|
@ -180,7 +179,6 @@ install -m 0755 -vp _bin/osbuild-image-tests %{buildroot}%
|
|
|
|
install -m 0755 -vp _bin/osbuild-auth-tests %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
|
|
|
install -m 0755 -vp _bin/osbuild-auth-tests %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
|
|
|
install -m 0755 -vp _bin/osbuild-koji-tests %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
|
|
|
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-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/osbuild-service-maintenance-tests %{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 _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/define-compose-url.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
|
|
@ -261,13 +259,13 @@ cd $PWD/_build/src/%{goipath}
|
|
|
|
%endif
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
|
|
%post
|
|
|
|
%post
|
|
|
|
%systemd_post osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-remote-worker.socket
|
|
|
|
%systemd_post osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-composer-prometheus.socket osbuild-remote-worker.socket
|
|
|
|
|
|
|
|
|
|
|
|
%preun
|
|
|
|
%preun
|
|
|
|
%systemd_preun osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-remote-worker.socket
|
|
|
|
%systemd_preun osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-composer-prometheus.socket osbuild-remote-worker.socket
|
|
|
|
|
|
|
|
|
|
|
|
%postun
|
|
|
|
%postun
|
|
|
|
%systemd_postun_with_restart osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-remote-worker.socket
|
|
|
|
%systemd_postun_with_restart osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-composer-prometheus.socket osbuild-remote-worker.socket
|
|
|
|
|
|
|
|
|
|
|
|
%files
|
|
|
|
%files
|
|
|
|
%license LICENSE
|
|
|
|
%license LICENSE
|
|
|
@ -276,6 +274,7 @@ cd $PWD/_build/src/%{goipath}
|
|
|
|
%{_unitdir}/osbuild-composer.service
|
|
|
|
%{_unitdir}/osbuild-composer.service
|
|
|
|
%{_unitdir}/osbuild-composer.socket
|
|
|
|
%{_unitdir}/osbuild-composer.socket
|
|
|
|
%{_unitdir}/osbuild-composer-api.socket
|
|
|
|
%{_unitdir}/osbuild-composer-api.socket
|
|
|
|
|
|
|
|
%{_unitdir}/osbuild-composer-prometheus.socket
|
|
|
|
%{_unitdir}/osbuild-local-worker.socket
|
|
|
|
%{_unitdir}/osbuild-local-worker.socket
|
|
|
|
%{_unitdir}/osbuild-remote-worker.socket
|
|
|
|
%{_unitdir}/osbuild-remote-worker.socket
|
|
|
|
%{_sysusersdir}/osbuild-composer.conf
|
|
|
|
%{_sysusersdir}/osbuild-composer.conf
|
|
|
@ -295,10 +294,10 @@ The core osbuild-composer binary. This is suitable both for spawning in containe
|
|
|
|
Summary: The worker for osbuild-composer
|
|
|
|
Summary: The worker for osbuild-composer
|
|
|
|
Requires: systemd
|
|
|
|
Requires: systemd
|
|
|
|
Requires: qemu-img
|
|
|
|
Requires: qemu-img
|
|
|
|
Requires: osbuild >= 80
|
|
|
|
Requires: osbuild >= 93
|
|
|
|
Requires: osbuild-ostree >= 80
|
|
|
|
Requires: osbuild-ostree >= 93
|
|
|
|
Requires: osbuild-lvm2 >= 80
|
|
|
|
Requires: osbuild-lvm2 >= 93
|
|
|
|
Requires: osbuild-luks2 >= 80
|
|
|
|
Requires: osbuild-luks2 >= 93
|
|
|
|
Requires: %{name}-dnf-json = %{version}-%{release}
|
|
|
|
Requires: %{name}-dnf-json = %{version}-%{release}
|
|
|
|
|
|
|
|
|
|
|
|
%description worker
|
|
|
|
%description worker
|
|
|
@ -417,9 +416,36 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
|
|
|
|
%endif
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
%changelog
|
|
|
|
* Wed Jul 26 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 75-1
|
|
|
|
* Thu Aug 24 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 88-1
|
|
|
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Wed Aug 09 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 87-1
|
|
|
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Wed Jul 26 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 86-1
|
|
|
|
- Rebuilt for MSVSphere 8.8
|
|
|
|
- Rebuilt for MSVSphere 8.8
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Wed Jul 26 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 86-1
|
|
|
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Fri Jul 14 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 85-1
|
|
|
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Wed Jun 14 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 84-1
|
|
|
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Wed May 17 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 82-1
|
|
|
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Wed Apr 19 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 80-1
|
|
|
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Wed Apr 05 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 79-1
|
|
|
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Wed Mar 08 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 77-1
|
|
|
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
|
|
* Wed Feb 22 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 75-1
|
|
|
|
* Wed Feb 22 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 75-1
|
|
|
|
- New upstream release
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
|
|