From ef392a5b93067ebc8da5c97d5417c71e6eb04f0d Mon Sep 17 00:00:00 2001 From: Alexander Todorov Date: Thu, 14 May 2020 20:16:12 +0300 Subject: [PATCH] Build -tests RPM on RHEL unconditionally --- osbuild-composer.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/osbuild-composer.spec b/osbuild-composer.spec index 53c67d63a..21b3f0a22 100644 --- a/osbuild-composer.spec +++ b/osbuild-composer.spec @@ -78,7 +78,7 @@ export GOFLAGS=-mod=vendor %gobuild -o _bin/osbuild-worker %{goipath}/cmd/osbuild-worker -%if %{with tests} +%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 @@ -118,7 +118,7 @@ install -m 0644 -vp distribution/osbuild-composer.conf %{buildroot}%{_sysus install -m 0755 -vd %{buildroot}%{_localstatedir}/cache/osbuild-composer/dnf-cache -%if %{with tests} +%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/ @@ -226,7 +226,7 @@ systemctl stop "osbuild-worker@*.service" "osbuild-remote-worker@*.service" # restart all the worker services %systemd_postun_with_restart "osbuild-worker@*.service" "osbuild-remote-worker@*.service" -%if %{with tests} +%if %{with tests} || 0%{?rhel} %package tests Summary: Integration tests