From 2ecada9614fa433d16c5cf49e00239c094eb2bae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Thu, 15 Oct 2020 22:35:11 +0200 Subject: [PATCH] RHEL 9.0.0 Alpha bootstrap The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/osbuild-composer#3656142047218c4840e9ba1ceea5510f59adf859 --- .gitignore | 13 ++ README.md | 3 + osbuild-composer.spec | 287 ++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 4 files changed, 304 insertions(+) create mode 100644 README.md create mode 100644 osbuild-composer.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore index e69de29..e990c9a 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,13 @@ +/osbuild-composer-8.tar.gz +/osbuild-composer-9.tar.gz +/osbuild-composer-10.tar.gz +/osbuild-composer-11.tar.gz +/osbuild-composer-12.tar.gz +/osbuild-composer-13.tar.gz +/osbuild-composer-14.tar.gz +/osbuild-composer-15.tar.gz +/osbuild-composer-16.tar.gz +/osbuild-composer-17.tar.gz +/osbuild-composer-18.tar.gz +/osbuild-composer-19.tar.gz +/osbuild-composer-20.tar.gz diff --git a/README.md b/README.md new file mode 100644 index 0000000..9635e82 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# osbuild-composer + +The osbuild-composer package \ No newline at end of file diff --git a/osbuild-composer.spec b/osbuild-composer.spec new file mode 100644 index 0000000..e779a7d --- /dev/null +++ b/osbuild-composer.spec @@ -0,0 +1,287 @@ +# Do not build with tests by default +# Pass --with tests to rpmbuild to override +%bcond_with tests + +%global goipath github.com/osbuild/osbuild-composer + +Version: 20 + +%gometa + +%global common_description %{expand: +An image building service based on osbuild +It is inspired by lorax-composer and exposes the same API. +As such, it is a drop-in replacement. +} + +Name: osbuild-composer +Release: 2%{?dist} +Summary: An image building service based on osbuild + +# osbuild-composer doesn't have support for building i686 images +# and also RHEL and Fedora has now only limited support for this arch. +ExcludeArch: i686 + +# Upstream license specification: Apache-2.0 +License: ASL 2.0 +URL: %{gourl} +Source0: %{gosource} + + +BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} +BuildRequires: systemd +%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/google/uuid) +BuildRequires: golang(github.com/julienschmidt/httprouter) +BuildRequires: golang(github.com/gobwas/glob) +BuildRequires: golang(github.com/google/go-cmp/cmp) +BuildRequires: golang(github.com/gophercloud/gophercloud) +BuildRequires: golang(github.com/stretchr/testify/assert) +BuildRequires: golang(github.com/vmware/govmomi) +%endif + +Requires: %{name}-worker = %{version}-%{release} +Requires: systemd +Requires: osbuild >= 18 +Requires: osbuild-ostree >= 18 +Requires: qemu-img + +Provides: weldr + +%if 0%{?rhel} +Obsoletes: lorax-composer <= 29 +Conflicts: lorax-composer +%endif + +# remove in F34 +Obsoletes: golang-github-osbuild-composer < %{version}-%{release} +Provides: golang-github-osbuild-composer = %{version}-%{release} + +%description +%{common_description} + +%prep +%if 0%{?rhel} +%forgeautosetup -p1 +%else +%goprep +%endif + +%build +%if 0%{?rhel} +GO_BUILD_PATH=$PWD/_build +install -m 0755 -vd $(dirname $GO_BUILD_PATH/src/%{goipath}) +ln -fs $PWD $GO_BUILD_PATH/src/%{goipath} +cd $GO_BUILD_PATH/src/%{goipath} +install -m 0755 -vd _bin +export PATH=$PWD/_bin${PATH:+:$PATH} +export GOPATH=$GO_BUILD_PATH:%{gopath} +export GOFLAGS=-mod=vendor +%endif + +%gobuild -o _bin/osbuild-composer %{goipath}/cmd/osbuild-composer +%gobuild -o _bin/osbuild-worker %{goipath}/cmd/osbuild-worker + + +%if %{with tests} || 0%{?rhel} + +# Build test binaries with `go test -c`, so that they can take advantage of +# golang's testing package. The golang rpm macros don't support building them +# directly. Thus, do it manually, taking care to also include a build id. +# +# On Fedora, also turn off go modules and set the path to the one into which +# the golang-* packages install source code. +%if 0%{?fedora} +export GO111MODULE=off +export GOPATH=%{gobuilddir}:%{gopath} +%endif + +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-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-image-tests %{goipath}/cmd/osbuild-image-tests + +%endif + +%install +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 -vd %{buildroot}%{_datadir}/osbuild-composer/repositories +install -m 0644 -vp repositories/* %{buildroot}%{_datadir}/osbuild-composer/repositories/ + +install -m 0755 -vd %{buildroot}%{_unitdir} +install -m 0644 -vp distribution/*.{service,socket} %{buildroot}%{_unitdir}/ + +install -m 0755 -vd %{buildroot}%{_sysusersdir} +install -m 0644 -vp distribution/osbuild-composer.conf %{buildroot}%{_sysusersdir}/ + +install -m 0755 -vd %{buildroot}%{_localstatedir}/cache/osbuild-composer/dnf-cache + +%if %{with tests} || 0%{?rhel} + +install -m 0755 -vd %{buildroot}%{_libexecdir}/tests/osbuild-composer +install -m 0755 -vp _bin/osbuild-tests %{buildroot}%{_libexecdir}/tests/osbuild-composer/ +install -m 0755 -vp _bin/osbuild-weldr-tests %{buildroot}%{_libexecdir}/tests/osbuild-composer/ +install -m 0755 -vp _bin/osbuild-dnf-json-tests %{buildroot}%{_libexecdir}/tests/osbuild-composer/ +install -m 0755 -vp _bin/osbuild-image-tests %{buildroot}%{_libexecdir}/tests/osbuild-composer/ +install -m 0755 -vp tools/image-info %{buildroot}%{_libexecdir}/osbuild-composer/ + +install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer +install -m 0644 -vp test/azure-deployment-template.json %{buildroot}%{_datadir}/tests/osbuild-composer/ + +install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/cases +install -m 0644 -vp test/cases/* %{buildroot}%{_datadir}/tests/osbuild-composer/cases/ +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 0644 -vp test/cloud-init/* %{buildroot}%{_datadir}/tests/osbuild-composer/cloud-init/ + +%endif + +%check +%if 0%{?rhel} +export GOFLAGS=-mod=vendor +export GOPATH=$PWD/_build:%{gopath} +# cd inside GOPATH, otherwise go with GO111MODULE=off ignores vendor directory +cd $PWD/_build/src/%{goipath} +%gotest ./... +%else +%gocheck +%endif + +%post +%systemd_post osbuild-composer.service osbuild-composer.socket osbuild-remote-worker.socket + +%preun +%systemd_preun osbuild-composer.service osbuild-composer.socket osbuild-remote-worker.socket + +%postun +%systemd_postun_with_restart osbuild-composer.service osbuild-composer.socket osbuild-remote-worker.socket + +%files +%license LICENSE +%doc README.md +%{_libexecdir}/osbuild-composer/osbuild-composer +%{_libexecdir}/osbuild-composer/dnf-json +%{_datadir}/osbuild-composer/ +%{_unitdir}/osbuild-composer.service +%{_unitdir}/osbuild-composer.socket +%{_unitdir}/osbuild-remote-worker.socket +%{_sysusersdir}/osbuild-composer.conf + +%package worker +Summary: The worker for osbuild-composer +Requires: systemd +Requires: osbuild + +# 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 + +%files worker +%{_libexecdir}/osbuild-composer/osbuild-worker +%{_unitdir}/osbuild-worker@.service +%{_unitdir}/osbuild-remote-worker@.service + +%post worker +%systemd_post osbuild-worker@.service osbuild-remote-worker@.service + +%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: + +# 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" + +%postun worker +# restart all the worker services +%systemd_postun_with_restart "osbuild-worker@*.service" "osbuild-remote-worker@*.service" + +%if %{with tests} || 0%{?rhel} + +%package tests +Summary: Integration tests +Requires: %{name} = %{version}-%{release} +Requires: composer-cli +Requires: createrepo_c +Requires: genisoimage +Requires: qemu-kvm-core +Requires: systemd-container +%ifarch %{arm} +Requires: edk2-aarch64 +%endif + +%description tests +Integration tests to be run on a pristine-dedicated system to test the osbuild-composer package. + +%files tests +%{_libexecdir}/tests/osbuild-composer/ +%{_datadir}/tests/osbuild-composer/ +%{_libexecdir}/osbuild-composer/image-info + +%endif + +%changelog +* Sun Aug 23 2020 Tom Gundersen - 20-1 +- New upstream release + +* Tue Aug 11 2020 Tom Gundersen - 19-1 +- New upstream release + +* Tue Jul 28 2020 Fedora Release Engineering - 18-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jul 22 2020 Ondrej Budai - 18-1 +- New upstream release + +* Wed Jul 08 2020 Ondrej Budai - 17-1 +- New upstream release + +* Mon Jun 29 2020 Ondrej Budai - 16-1 +- New upstream release + +* Fri Jun 12 2020 Ondrej Budai - 15-1 +- New upstream release + +* Thu Jun 04 2020 Ondrej Budai - 14-1 +- New upstream release + +* Fri May 29 2020 Ondrej Budai - 13-2 +- Add missing osbuild-ostree dependency + +* Thu May 28 2020 Ondrej Budai - 13-1 +- New upstream release + +* Thu May 14 2020 Ondrej Budai - 12-1 +- New upstream release + +* Wed Apr 29 2020 Ondrej Budai - 11-1 +- New upstream release + +* Wed Apr 15 2020 Ondrej Budai - 10-1 +- New upstream release + +* Wed Apr 01 2020 Ondrej Budai - 9-1 +- New upstream release + +* Mon Mar 23 2020 Ondrej Budai - 8-1 +- Initial package (renamed from golang-github-osbuild-composer) diff --git a/sources b/sources new file mode 100644 index 0000000..e7329a3 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (osbuild-composer-20.tar.gz) = 08af438be4adcd9911800beac8f457296db1eb37000d14b7c14944eb93c7486379658d55e716683f36d5cc69260339552452118d1a41f0dbb82fac49d8d4e360