rpm/openQA
SHA256
1
0
Fork 0
forked from pool/openQA
Code Pull Requests Activity

Accepting request 494011 from home:jengelh:branches:devel:openQA:tested

Browse Source 
- Do not suppress errors from useradd
- Rectify RPM groups
- replace extra tar line with house tools

OBS-URL: https://build.opensuse.org/request/show/494011
OBS-URL: https://build.opensuse.org/package/show/devel:openQA:tested/openQA?expand=0&rev=11
This commit is contained in:
Oliver Kurz 2017-05-11 05:41:11 +00:00 committed by Git OBS Bridge
parent b00a5e4ec4
commit de73cbfe52
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openQA.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed May 10 07:49:39 UTC 2017 - jengelh@inai.de
- Do not suppress errors from useradd
- Rectify RPM groups
-------------------------------------------------------------------
Thu Apr 06 09:17:10 UTC 2017 - rd-ops-cm@suse.de

24
openQA.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package openQA
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -80,15 +80,15 @@ BuildRequires: %{t_requires}
Requires: dbus-1
BuildRequires: fdupes
%if %{with tests}
BuildRequires: perl-App-cpanminus
BuildRequires: phantomjs
BuildRequires: perl(Mojo::RabbitMQ::Client)
BuildRequires: perl(Perl::Tidy)
BuildRequires: perl(Perl::Critic)
BuildRequires: perl(Perl::Tidy)
BuildRequires: perl(Selenium::Remote::Driver)
BuildRequires: perl(Test::Compile)
BuildRequires: perl(Test::MockObject)
BuildRequires: perl(Test::Warnings)
BuildRequires: perl-App-cpanminus
%endif
Requires(post): perl(DBIx::Class::DeploymentHandler)
Requires(post): perl(SQL::SplitStatement)
@ -156,15 +156,14 @@ a convenient helper for interacting with openQA webui REST API.
%package doc
Summary: The openQA documentation
Group: Development/Tools/Other
Group: Documentation/Other
%description doc
Documentation material covering installation, configuration, basic test writing, etc.
Covering both openQA and also os-autoinst test engine..
Covering both openQA and also os-autoinst test engine.
%prep
%setup
tar xvf %{S:1}
%setup -a1
%build
make
@ -212,10 +211,9 @@ mkdir %{buildroot}%{_localstatedir}/lib/openqa/cache
rm -f %{buildroot}/etc/dbus-1/system.d/org.opensuse.openqa.conf
%pre
if ! getent passwd geekotest > /dev/null; then
getent passwd geekotest >/dev/null || \
/usr/sbin/useradd -r -g nogroup -c "openQA user" \
-d /var/lib/openqa geekotest 2>/dev/null || :
fi
-d /var/lib/openqa geekotest
%service_add_pre %openqa_services
@ -234,9 +232,9 @@ if [ "$1" = 1 ]; then
fi
%pre worker
if ! getent passwd _openqa-worker > /dev/null; then
if ! getent passwd _openqa-worker >/dev/null; then
/usr/sbin/useradd -r -g nogroup -c "openQA worker" \
-d /var/lib/empty _openqa-worker 2>/dev/null || :
-d /var/lib/empty _openqa-worker
# might fail for non-kvm workers (qemu package owns the group)
/usr/sbin/usermod _openqa-worker -a -G kvm || :
fi
@ -402,6 +400,4 @@ fi
%defattr(-,root,root)
%doc docs/*
%changelog