diff --git a/openQA-4.6.1687285703.cd38e7f.obscpio b/openQA-4.6.1687285703.cd38e7f.obscpio deleted file mode 100644 index b97ffec..0000000 --- a/openQA-4.6.1687285703.cd38e7f.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7ecd16098ebca218d9c3fdfd472a87b2752472940398ee8e93b4d2a89305aad0 -size 14340109 diff --git a/openQA-4.6.1687510203.8d9fc92.obscpio b/openQA-4.6.1687510203.8d9fc92.obscpio new file mode 100644 index 0000000..9250561 --- /dev/null +++ b/openQA-4.6.1687510203.8d9fc92.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:17a589c93785a8f926be88874159ef6038c3a5200e532272ef4e75b2fcbb12de +size 14338573 diff --git a/openQA-client-test.spec b/openQA-client-test.spec index daa2125..b4366f8 100644 --- a/openQA-client-test.spec +++ b/openQA-client-test.spec @@ -18,7 +18,7 @@ %define short_name openQA-client Name: %{short_name}-test -Version: 4.6.1687285703.cd38e7f +Version: 4.6.1687510203.8d9fc92 Release: 0 Summary: Test package for %{short_name} License: GPL-2.0-or-later diff --git a/openQA-devel-test.spec b/openQA-devel-test.spec index f7f5970..3112bee 100644 --- a/openQA-devel-test.spec +++ b/openQA-devel-test.spec @@ -18,7 +18,7 @@ %define short_name openQA-devel Name: %{short_name}-test -Version: 4.6.1687285703.cd38e7f +Version: 4.6.1687510203.8d9fc92 Release: 0 Summary: Test package for %{short_name} License: GPL-2.0-or-later diff --git a/openQA-test.spec b/openQA-test.spec index 2d42278..14200e7 100644 --- a/openQA-test.spec +++ b/openQA-test.spec @@ -18,7 +18,7 @@ %define short_name openQA Name: %{short_name}-test -Version: 4.6.1687285703.cd38e7f +Version: 4.6.1687510203.8d9fc92 Release: 0 Summary: Test package for openQA License: GPL-2.0-or-later diff --git a/openQA-worker-test.spec b/openQA-worker-test.spec index ced724d..643ce4b 100644 --- a/openQA-worker-test.spec +++ b/openQA-worker-test.spec @@ -18,7 +18,7 @@ %define short_name openQA-worker Name: %{short_name}-test -Version: 4.6.1687285703.cd38e7f +Version: 4.6.1687510203.8d9fc92 Release: 0 Summary: Test package for %{short_name} License: GPL-2.0-or-later diff --git a/openQA.changes b/openQA.changes index 820b55d..4001d6b 100644 --- a/openQA.changes +++ b/openQA.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Fri Jun 23 11:38:55 UTC 2023 - okurz@suse.com + +- Update to version 4.6.1687510203.8d9fc92: + * Add a hint regarding changes in the external directory + * Add subpackage openQA-munin + * Avoid hard dependency on Apache in systemd file + * Prevent sponsor logo overflow + * docs: Feature the "single-instance" container most prominently + * docs: Add single-instance container instructions + * docs: Remove obsolete note about Leap <15.2 + * Fix style check finding false-positive problems + * Remove experimental regex from test + * Simplify regex validation helper + * Catch regex errors when filtering dashboards + * Improve regex validation test + * Delete potential extra lines from regex validation error + * Simplify regex validation via `use warnings FATAL => 'regexp'` + * Validate regex for filtering groups on dashboard pages + * Show possibly returned error message when loading dashboard + ------------------------------------------------------------------- Wed Jun 21 03:38:56 UTC 2023 - okurz@suse.com diff --git a/openQA.obsinfo b/openQA.obsinfo index d72caa6..31f4ee2 100644 --- a/openQA.obsinfo +++ b/openQA.obsinfo @@ -1,4 +1,4 @@ name: openQA -version: 4.6.1687285703.cd38e7f -mtime: 1687285703 -commit: cd38e7f924125b17bf9e56e3d70e99b1e50e2318 +version: 4.6.1687510203.8d9fc92 +mtime: 1687510203 +commit: 8d9fc9268271afe303fd65746c24f4ad3f29fa56 diff --git a/openQA.spec b/openQA.spec index 485a55e..ae6dd0f 100644 --- a/openQA.spec +++ b/openQA.spec @@ -78,7 +78,7 @@ %define devel_requires %devel_no_selenium_requires chromedriver Name: openQA -Version: 4.6.1687285703.cd38e7f +Version: 4.6.1687510203.8d9fc92 Release: 0 Summary: The openQA web-frontend, scheduler and tools License: GPL-2.0-or-later @@ -287,6 +287,18 @@ upgrading the system if devel:openQA packages are stable and contain updates. It is complementary to auto-update which also reboots the system and does updates regardless of whether devel:openQA contains updates. +%package munin +Summary: Munin scripts +Group: Development/Tools/Other +Requires: curl +Requires: munin +Requires: munin-node +Requires: perl + +%description munin +Use this package to install munin scripts that allow to monitor some openQA +statistics. + %prep %setup -q -a1 sed -e 's,/bin/env python,/bin/python,' -i script/openqa-label-all @@ -367,6 +379,12 @@ ln -s %{_datadir}/openqa/script/setup-db %{buildroot}%{_bindir}/openqa-setup-db ln -s %{_datadir}/openqa/script/openqa-label-all %{buildroot}%{_bindir}/openqa-label-all %endif +# munin +install -d -m 755 %{buildroot}/%{_prefix}/lib/munin/plugins +install -m 755 contrib/munin/plugins/minion %{buildroot}/%{_prefix}/lib/munin/plugins/openqa_minion_ +install -d -m 755 %{buildroot}/%{_sysconfdir}/munin/plugin-conf.d +install -m 644 contrib/munin/config/minion.config %{buildroot}/%{_sysconfdir}/munin/plugin-conf.d/openqa-minion + cd %{buildroot} grep -rl %{_bindir}/env . | while read file; do sed -e 's,%{_bindir}/env perl,%{_bindir}/perl,' -i $file @@ -743,4 +761,14 @@ fi %{_unitdir}/openqa-continuous-update.* %{_datadir}/openqa/script/openqa-continuous-update +%files munin +%defattr(-,root,root) +%doc contrib/munin/config/minion.config +%dir %{_prefix}/lib/munin +%dir %{_prefix}/lib/munin/plugins +%dir %{_sysconfdir}/munin +%dir %{_sysconfdir}/munin/plugin-conf.d +%{_prefix}/lib/munin/plugins/openqa_minion_ +%{_sysconfdir}/munin/plugin-conf.d/openqa-minion + %changelog