forked from pool/openQA
Accepting request 503557 from devel:openQA:tested
- Update to version 4.4.1497257618.89b04ed8: * Allow plugins to load specific configurations * Remove auth_config from OpenQA::WebAPI::Auth::* * Add fullscreen base into project * Add form entry for fullscreen view * Fix navbar to not hide if dropdown selected * Change help popover description in filtersection * Correct main controller and index page * Add error message for missing webserver * Add link to CaaSP staging (#1360) * Also recognize fdo bugrefs in Utils.pm (#1367) * Database change for bug status * Improve assets log messages (#1365) * Documentation for GRE (#1369) * Extend sorting by time to parent group overview (#1362) - Include upstream changes for worker with no-cleanup - Prequire needed group nogroup - Re-enable dbus service installation - Do not suppress errors from useradd - Rectify RPM groups OBS-URL: https://build.opensuse.org/request/show/503557 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openQA?expand=0&rev=2
This commit is contained in:
commit
74b1c2b1c2
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c205f6ab3bb8fc847058b4a9df1824c29c1c8deb7cb3feba2bf82e69a16789b2
|
||||
size 1186474
|
||||
oid sha256:68a56ad0f2d8e03001fa8c392cdeedcd4e9249153bd75b6a37487b9aeef4d121
|
||||
size 1183289
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:947901d9c54c8e48f2ce4ddf3d65c526fe72f8c1b59c23931e4f5807cbd83477
|
||||
size 1368932
|
3
openQA-4.4.1497257618.89b04ed8.tar.xz
Normal file
3
openQA-4.4.1497257618.89b04ed8.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ceb5bcb75d755b74a6ae34890450e77d4c4d86fb4dca8913d024b8442225891e
|
||||
size 1382748
|
@ -1,3 +1,38 @@
|
||||
Tue Jun 13 20:33:37 UTC 2017 - rd-ops-cm@suse.de
|
||||
|
||||
- Update to version 4.4.1497257618.89b04ed8:
|
||||
* Allow plugins to load specific configurations
|
||||
* Remove auth_config from OpenQA::WebAPI::Auth::*
|
||||
* Add fullscreen base into project
|
||||
* Add form entry for fullscreen view
|
||||
* Fix navbar to not hide if dropdown selected
|
||||
* Change help popover description in filtersection
|
||||
* Correct main controller and index page
|
||||
* Add error message for missing webserver
|
||||
* Add link to CaaSP staging (#1360)
|
||||
* Also recognize fdo bugrefs in Utils.pm (#1367)
|
||||
* Database change for bug status
|
||||
* Improve assets log messages (#1365)
|
||||
* Documentation for GRE (#1369)
|
||||
* Extend sorting by time to parent group overview (#1362)
|
||||
- Include upstream changes for worker with no-cleanup
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue May 16 09:56:40 UTC 2017 - mlin@suse.com
|
||||
|
||||
- Prequire needed group nogroup
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu May 11 05:43:42 UTC 2017 - okurz@suse.com
|
||||
|
||||
- Re-enable dbus service installation
|
||||
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
|
44
openQA.spec
44
openQA.spec
@ -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
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
# can't use linebreaks here!
|
||||
%define openqa_services openqa-webui.service openqa-gru.service openqa-websockets.service openqa-scheduler.service
|
||||
%define openqa_worker_services openqa-worker.target openqa-worker@.service openqa-slirpvde.service openqa-vde_switch.service
|
||||
%define openqa_worker_services openqa-worker.target openqa-worker@.service openqa-worker-no-cleanup@.service openqa-slirpvde.service openqa-vde_switch.service
|
||||
|
||||
%if %{undefined tmpfiles_create}
|
||||
%define tmpfiles_create() \
|
||||
@ -26,7 +26,7 @@
|
||||
%{nil}
|
||||
%endif
|
||||
|
||||
%if %suse_version >= 1330
|
||||
%if %suse_version >= 1730
|
||||
%ifarch x86_64
|
||||
%bcond_without tests
|
||||
%else
|
||||
@ -37,7 +37,7 @@
|
||||
%endif
|
||||
|
||||
Name: openQA
|
||||
Version: 4.4.1491400697.19ef0fc5
|
||||
Version: 4.4.1497257618.89b04ed8
|
||||
Release: 0
|
||||
Summary: The openQA web-frontend, scheduler and tools
|
||||
License: GPL-2.0+
|
||||
@ -66,7 +66,7 @@ Recommends: logrotate
|
||||
# for postgresql
|
||||
Recommends: perl(DateTime::Format::Pg) perl(DBD::Pg)
|
||||
# runtime requirements that also the testsuite needs
|
||||
%define t_requires perl(DBD::SQLite) perl(DBIx::Class) perl(Config::IniFiles) perl(SQL::Translator) perl(Date::Format) perl(File::Copy::Recursive) perl(DateTime::Format::SQLite) perl(Net::OpenID::Consumer) perl(Mojolicious::Plugin::RenderFile) perl(Mojolicious::Plugin::AssetPack) perl(aliased) perl(Config::Tiny) perl(DBIx::Class::DynamicDefault) perl(DBIx::Class::Schema::Config) perl(DBIx::Class::Storage::Statistics) perl(IO::Socket::SSL) perl(Data::Dump) perl(DBIx::Class::OptimisticLocking) perl(Text::Markdown) perl(Net::DBus) perl(IPC::Run) perl(Archive::Extract) perl(CSS::Minifier::XS) perl(JavaScript::Minifier::XS) perl(Time::ParseDate) perl(Sort::Versions) perl(Mojo::RabbitMQ::Client)
|
||||
%define t_requires perl(DBD::SQLite) perl(DBIx::Class) perl(Config::IniFiles) perl(SQL::Translator) perl(Date::Format) perl(File::Copy::Recursive) perl(DateTime::Format::SQLite) perl(Net::OpenID::Consumer) perl(Mojolicious::Plugin::RenderFile) perl(Mojolicious::Plugin::AssetPack) perl(aliased) perl(Config::Tiny) perl(DBIx::Class::DynamicDefault) perl(DBIx::Class::Schema::Config) perl(DBIx::Class::Storage::Statistics) perl(IO::Socket::SSL) perl(Data::Dump) perl(DBIx::Class::OptimisticLocking) perl(Text::Markdown) perl(Net::DBus) perl(IPC::Run) perl(Archive::Extract) perl(CSS::Minifier::XS) perl(JavaScript::Minifier::XS) perl(Time::ParseDate) perl(Sort::Versions) perl(Mojo::RabbitMQ::Client) perl(BSD::Resource)
|
||||
BuildRequires: perl(Mojolicious) >= 7.24
|
||||
BuildRequires: perl(Mojolicious::Plugin::AssetPack) >= 1.36
|
||||
# critical bug fix
|
||||
@ -80,19 +80,22 @@ 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)
|
||||
Requires(post): coreutils
|
||||
%if 0%{?suse_version} >= 1330
|
||||
Requires(pre): group(nogroup)
|
||||
%endif
|
||||
%{?systemd_requires}
|
||||
BuildArch: noarch
|
||||
# we need to have the same sha1 as expected
|
||||
@ -137,6 +140,9 @@ Requires: openQA-client = %{version}
|
||||
Requires: os-autoinst < 5
|
||||
Recommends: qemu
|
||||
Requires: perl(SQL::SplitStatement)
|
||||
%if 0%{?suse_version} >= 1330
|
||||
Requires(pre): group(nogroup)
|
||||
%endif
|
||||
|
||||
%description worker
|
||||
The openQA worker manages test engine (provided by os-autoinst package).
|
||||
@ -160,11 +166,10 @@ Group: Development/Tools/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
|
||||
@ -208,14 +213,11 @@ mkdir %{buildroot}%{_localstatedir}/lib/openqa/pool/1
|
||||
mkdir %{buildroot}%{_localstatedir}/lib/openqa/cache
|
||||
#
|
||||
%fdupes %buildroot/%_prefix
|
||||
# Disable service install for now, waiting for boo#1032649
|
||||
rm -f %{buildroot}/etc/dbus-1/system.d/org.opensuse.openqa.conf
|
||||
|
||||
%pre
|
||||
if ! getent passwd geekotest > /dev/null; then
|
||||
/usr/sbin/useradd -r -g nogroup -c "openQA user" \
|
||||
-d /var/lib/openqa geekotest 2>/dev/null || :
|
||||
fi
|
||||
getent passwd geekotest >/dev/null || \
|
||||
/usr/sbin/useradd -r -g nogroup -c "openQA user" \
|
||||
-d /var/lib/openqa geekotest
|
||||
|
||||
%service_add_pre %openqa_services
|
||||
|
||||
@ -234,9 +236,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
|
||||
@ -296,8 +298,7 @@ fi
|
||||
%{_datadir}/openqa/etc/openqa/openqa.ini
|
||||
%{_datadir}/openqa/etc/openqa/database.ini
|
||||
%config %{_sysconfdir}/logrotate.d
|
||||
# Disable service install for now, waiting for boo#1032649
|
||||
#%%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.opensuse.openqa.conf
|
||||
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.opensuse.openqa.conf
|
||||
# apache vhost
|
||||
%dir %{_sysconfdir}/apache2
|
||||
%dir %{_sysconfdir}/apache2/vhosts.d
|
||||
@ -372,6 +373,7 @@ fi
|
||||
%{_libexecdir}/systemd/system-generators
|
||||
%{_unitdir}/openqa-worker.target
|
||||
%{_unitdir}/openqa-worker@.service
|
||||
%{_unitdir}/openqa-worker-no-cleanup@.service
|
||||
%{_unitdir}/openqa-slirpvde.service
|
||||
%{_unitdir}/openqa-vde_switch.service
|
||||
%{_tmpfilesdir}/openqa.conf
|
||||
@ -402,6 +404,4 @@ fi
|
||||
%defattr(-,root,root)
|
||||
%doc docs/*
|
||||
|
||||
|
||||
|
||||
%changelog
|
||||
|
Loading…
Reference in New Issue
Block a user