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

Accepting request 503545 from devel:openQA:tested

Browse Source 
Revert to r14

OBS-URL: https://build.opensuse.org/request/show/503545
OBS-URL: https://build.opensuse.org/package/show/devel:openQA:tested/openQA?expand=0&rev=16
This commit is contained in:
Oliver Kurz 2017-06-14 06:07:13 +00:00 committed by Git OBS Bridge
parent 996c6fb019
commit c5475a65a5
5 changed files with 77 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cache.txz
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:68a56ad0f2d8e03001fa8c392cdeedcd4e9249153bd75b6a37487b9aeef4d121 oid sha256:c205f6ab3bb8fc847058b4a9df1824c29c1c8deb7cb3feba2bf82e69a16789b2
size 1183289 size 1186474

3
openQA-4.4.1491400697.19ef0fc5.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:947901d9c54c8e48f2ce4ddf3d65c526fe72f8c1b59c23931e4f5807cbd83477
size 1368932

3
openQA-4.4.1497257618.89b04ed8.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ceb5bcb75d755b74a6ae34890450e77d4c4d86fb4dca8913d024b8442225891e
size 1382748

21
openQA.changes
View File

@ -1,24 +1,3 @@
-------------------------------------------------------------------
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
- Clean spec file with spec-clean
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 16 09:56:40 UTC 2017 - mlin@suse.com Tue May 16 09:56:40 UTC 2017 - mlin@suse.com

138
openQA.spec
View File

@ -18,13 +18,15 @@
# can't use linebreaks here! # can't use linebreaks here!
%define openqa_services openqa-webui.service openqa-gru.service openqa-websockets.service openqa-scheduler.service %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-worker-no-cleanup@.service openqa-slirpvde.service openqa-vde_switch.service %define openqa_worker_services openqa-worker.target openqa-worker@.service openqa-slirpvde.service openqa-vde_switch.service
%if %{undefined tmpfiles_create} %if %{undefined tmpfiles_create}
%define tmpfiles_create() \ %define tmpfiles_create() \
%{_bindir}/systemd-tmpfiles --create %{?*} || : \ /usr/bin/systemd-tmpfiles --create %{?*} || : \
%{nil} %{nil}
%endif %endif
%if 0%{?suse_version} >= 1730
%if %suse_version >= 1730
%ifarch x86_64 %ifarch x86_64
%bcond_without tests %bcond_without tests
%else %else
@ -33,10 +35,9 @@
%else %else
%bcond_with tests %bcond_with tests
%endif %endif
# 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) perl(BSD::Resource)
Name: openQA Name: openQA
Version: 4.4.1497257618.89b04ed8 Version: 4.4.1491400697.19ef0fc5
Release: 0 Release: 0
Summary: The openQA web-frontend, scheduler and tools Summary: The openQA web-frontend, scheduler and tools
License: GPL-2.0+ License: GPL-2.0+
@ -47,43 +48,37 @@ Source0: %{name}-%{version}.tar.xz
# use update-cache to update it # use update-cache to update it
Source1: cache.txz Source1: cache.txz
Source101: update-cache.sh Source101: update-cache.sh
BuildRequires: %{t_requires} ExcludeArch: i586
BuildRequires: fdupes BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires(post): sqlite3
BuildRequires: os-autoinst BuildRequires: os-autoinst
BuildRequires: systemd
# critical bug fix
BuildRequires: perl(DBIx::Class) >= 0.082801
BuildRequires: perl(Mojolicious) >= 7.24
BuildRequires: perl(Mojolicious::Plugin::AssetPack) >= 1.36
BuildRequires: rubygem(sass)
Requires: dbus-1
# needed for test suite
Requires: git-core
Requires: openQA-client = %{version} Requires: openQA-client = %{version}
Requires: openQA-common = %{version} Requires: openQA-common = %{version}
# needed for saving needles optimized Requires: perl(URI)
Requires: optipng BuildRequires: systemd
Requires: perl(DBIx::Class) >= 0.082801 BuildRequires: rubygem(sass)
# needed for openid support # needed for openid support
Requires: perl(LWP::Protocol::https) Requires: perl(LWP::Protocol::https)
Requires: perl(URI)
# we need to have the same sha1 as expected
%requires_eq perl-Mojolicious-Plugin-AssetPack
Requires(post): coreutils
Requires(post): sqlite3
Requires(post): perl(DBIx::Class::DeploymentHandler)
Requires(post): perl(SQL::SplitStatement)
Recommends: apache2
Recommends: apparmor-profiles Recommends: apparmor-profiles
Recommends: apparmor-utils Recommends: apparmor-utils
Recommends: apache2
Recommends: logrotate Recommends: logrotate
# for postgresql # for postgresql
Recommends: perl(DBD::Pg) Recommends: perl(DateTime::Format::Pg) perl(DBD::Pg)
Recommends: perl(DateTime::Format::Pg) # runtime requirements that also the testsuite needs
BuildRoot: %{_tmppath}/%{name}-%{version}-build %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)
BuildArch: noarch BuildRequires: perl(Mojolicious) >= 7.24
ExcludeArch: i586 BuildRequires: perl(Mojolicious::Plugin::AssetPack) >= 1.36
%{?systemd_requires} # critical bug fix
BuildRequires: perl(DBIx::Class) >= 0.082801
Requires: perl(DBIx::Class) >= 0.082801
# needed for test suite
Requires: git-core
# needed for saving needles optimized
Requires: optipng
BuildRequires: %{t_requires}
Requires: dbus-1
BuildRequires: fdupes
%if %{with tests} %if %{with tests}
BuildRequires: perl-App-cpanminus BuildRequires: perl-App-cpanminus
BuildRequires: phantomjs BuildRequires: phantomjs
@ -95,9 +90,16 @@ BuildRequires: perl(Test::Compile)
BuildRequires: perl(Test::MockObject) BuildRequires: perl(Test::MockObject)
BuildRequires: perl(Test::Warnings) BuildRequires: perl(Test::Warnings)
%endif %endif
Requires(post): perl(DBIx::Class::DeploymentHandler)
Requires(post): perl(SQL::SplitStatement)
Requires(post): coreutils
%if 0%{?suse_version} >= 1330 %if 0%{?suse_version} >= 1330
Requires(pre): group(nogroup) Requires(pre): group(nogroup)
%endif %endif
%{?systemd_requires}
BuildArch: noarch
# we need to have the same sha1 as expected
%requires_eq perl-Mojolicious-Plugin-AssetPack
%description %description
openQA is a testing framework that allows you to test GUI applications on one openQA is a testing framework that allows you to test GUI applications on one
@ -131,14 +133,13 @@ openQA workers.
%package worker %package worker
Summary: The openQA worker Summary: The openQA worker
Group: Development/Tools/Other Group: Development/Tools/Other
Requires: openQA-client = %{version}
Requires: os-autoinst < 5
Requires: perl(SQL::SplitStatement)
# FIXME: use proper Requires(pre/post/preun/...)
PreReq: openQA-common = %{version} PreReq: openQA-common = %{version}
Requires(post): coreutils Requires(post): coreutils
Requires(post): os-autoinst >= 4.4 Requires(post): os-autoinst >= 4.4
Requires: openQA-client = %{version}
Requires: os-autoinst < 5
Recommends: qemu Recommends: qemu
Requires: perl(SQL::SplitStatement)
%if 0%{?suse_version} >= 1330 %if 0%{?suse_version} >= 1330
Requires(pre): group(nogroup) Requires(pre): group(nogroup)
%endif %endif
@ -168,10 +169,10 @@ Documentation material covering installation, configuration, basic test writing,
Covering both openQA and also os-autoinst test engine. Covering both openQA and also os-autoinst test engine.
%prep %prep
%setup -q -a1 %setup -a1
%build %build
make %{?_smp_mflags} make
%check %check
#for double checking #for double checking
@ -190,15 +191,15 @@ OBS_RUN=1 prove -r -j2 -v
%install %install
%make_install %make_install
mkdir -p %{buildroot}%{_datadir}/openqa%{_sysconfdir}/openqa mkdir -p %{buildroot}/usr/share/openqa/etc/openqa
ln -s %{_sysconfdir}/openqa/openqa.ini %{buildroot}%{_datadir}/openqa%{_sysconfdir}/openqa/openqa.ini ln -s /etc/openqa/openqa.ini %{buildroot}/usr/share/openqa/etc/openqa/openqa.ini
ln -s %{_sysconfdir}/openqa/database.ini %{buildroot}%{_datadir}/openqa%{_sysconfdir}/openqa/database.ini ln -s /etc/openqa/database.ini %{buildroot}/usr/share/openqa/etc/openqa/database.ini
mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_bindir}
ln -s %{_datadir}/openqa/script/client %{buildroot}%{_bindir}/openqa-client ln -s /usr/share/openqa/script/client %{buildroot}%{_bindir}/openqa-client
cd %{buildroot} cd %buildroot
grep -rl %{_bindir}/env . | while read file; do grep -rl /usr/bin/env . | while read file; do
sed -e 's,%{_bindir}/env perl,%{_bindir}/perl,' -i $file sed -e 's,/usr/bin/env perl,/usr/bin/perl,' -i $file
done done
mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}%{_sbindir}
for i in webui gru worker scheduler websockets slirpvde vde_switch; do for i in webui gru worker scheduler websockets slirpvde vde_switch; do
@ -206,19 +207,19 @@ for i in webui gru worker scheduler websockets slirpvde vde_switch; do
done done
# #
install -D -m 644 /dev/null %{buildroot}%{_localstatedir}/log/openqa install -D -m 644 /dev/null %{buildroot}%{_localstatedir}/log/openqa
install -m 0644 %{_sourcedir}/openQA.changes %{buildroot}%{_datadir}/openqa/public/Changelog install -m 0644 %_sourcedir/openQA.changes %{buildroot}%{_datadir}/openqa/public/Changelog
# #
mkdir %{buildroot}%{_localstatedir}/lib/openqa/pool/1 mkdir %{buildroot}%{_localstatedir}/lib/openqa/pool/1
mkdir %{buildroot}%{_localstatedir}/lib/openqa/cache mkdir %{buildroot}%{_localstatedir}/lib/openqa/cache
# #
%fdupes %{buildroot}/%{_prefix} %fdupes %buildroot/%_prefix
%pre %pre
getent passwd geekotest >/dev/null || \ getent passwd geekotest >/dev/null || \
%{_sbindir}/useradd -r -g nogroup -c "openQA user" \ /usr/sbin/useradd -r -g nogroup -c "openQA user" \
-d %{_localstatedir}/lib/openqa geekotest -d /var/lib/openqa geekotest
%service_add_pre %{openqa_services} %service_add_pre %openqa_services
%pre common %pre common
if [ "$1" = 1 ]; then if [ "$1" = 1 ]; then
@ -236,23 +237,23 @@ fi
%pre worker %pre worker
if ! getent passwd _openqa-worker >/dev/null; then if ! getent passwd _openqa-worker >/dev/null; then
%{_sbindir}/useradd -r -g nogroup -c "openQA worker" \ /usr/sbin/useradd -r -g nogroup -c "openQA worker" \
-d %{_localstatedir}/lib/empty _openqa-worker -d /var/lib/empty _openqa-worker
# might fail for non-kvm workers (qemu package owns the group) # might fail for non-kvm workers (qemu package owns the group)
%{_sbindir}/usermod _openqa-worker -a -G kvm || : /usr/sbin/usermod _openqa-worker -a -G kvm || :
fi fi
%service_add_pre %{openqa_worker_services} %service_add_pre %openqa_worker_services
%post %post
# install empty log file # install empty log file
if [ ! -e %{_localstatedir}/log/openqa ]; then if [ ! -e /var/log/openqa ]; then
install -D -m 644 -o geekotest /dev/null %{_localstatedir}/log/openqa || : install -D -m 644 -o geekotest /dev/null %{_localstatedir}/log/openqa || :
fi fi
if [ $1 -eq 1 ]; then if [ $1 -eq 1 ]; then
echo "### copy and edit %{_sysconfdir}/apache2/vhosts.d/openqa.conf.template!" echo "### copy and edit /etc/apache2/vhosts.d/openqa.conf.template!"
echo "### run sudo %{_datadir}/openqa/script/fetchneedles" echo "### run sudo /usr/share/openqa/script/fetchneedles"
else else
if [ -d "%{_localstatedir}/lib/openqa/share/testresults" ]; then if [ -d "%{_localstatedir}/lib/openqa/share/testresults" ]; then
@ -262,24 +263,24 @@ else
fi fi
fi fi
%service_add_post %{openqa_services} %service_add_post %openqa_services
%post worker %post worker
%tmpfiles_create %{_tmpfilesdir}/openqa.conf %tmpfiles_create %{_tmpfilesdir}/openqa.conf
%service_add_post %{openqa_worker_services} %service_add_post %openqa_worker_services
%preun %preun
%service_del_preun %{openqa_services} %service_del_preun %openqa_services
%preun worker %preun worker
%service_del_preun %{openqa_worker_services} %service_del_preun %openqa_worker_services
%postun %postun
%service_del_postun %{openqa_services} %service_del_postun %openqa_services
%restart_on_update boot.apparmor %restart_on_update boot.apparmor
%postun worker %postun worker
%service_del_postun %{openqa_worker_services} %service_del_postun %openqa_worker_services
%files %files
%defattr(-,root,root) %defattr(-,root,root)
@ -293,9 +294,9 @@ fi
%config(noreplace) %attr(-,geekotest,root) %{_sysconfdir}/openqa/database.ini %config(noreplace) %attr(-,geekotest,root) %{_sysconfdir}/openqa/database.ini
%dir %{_datadir}/openqa %dir %{_datadir}/openqa
%dir %{_datadir}/openqa/etc %dir %{_datadir}/openqa/etc
%dir %{_datadir}/openqa%{_sysconfdir}/openqa %dir %{_datadir}/openqa/etc/openqa
%{_datadir}/openqa%{_sysconfdir}/openqa/openqa.ini %{_datadir}/openqa/etc/openqa/openqa.ini
%{_datadir}/openqa%{_sysconfdir}/openqa/database.ini %{_datadir}/openqa/etc/openqa/database.ini
%config %{_sysconfdir}/logrotate.d %config %{_sysconfdir}/logrotate.d
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.opensuse.openqa.conf %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.opensuse.openqa.conf
# apache vhost # apache vhost
@ -372,7 +373,6 @@ fi
%{_libexecdir}/systemd/system-generators %{_libexecdir}/systemd/system-generators
%{_unitdir}/openqa-worker.target %{_unitdir}/openqa-worker.target
%{_unitdir}/openqa-worker@.service %{_unitdir}/openqa-worker@.service
%{_unitdir}/openqa-worker-no-cleanup@.service
%{_unitdir}/openqa-slirpvde.service %{_unitdir}/openqa-slirpvde.service
%{_unitdir}/openqa-vde_switch.service %{_unitdir}/openqa-vde_switch.service
%{_tmpfilesdir}/openqa.conf %{_tmpfilesdir}/openqa.conf