From 4c8a8fbfc8bc8672cb37b95774d8ff8f33281c6ee83933c4072211ad64c92c2c Mon Sep 17 00:00:00 2001 From: Oliver Kurz Date: Mon, 16 Sep 2024 12:42:05 +0000 Subject: [PATCH] Offline generation of 4.6.1726480610.b2c7833e 4.6.1726480610.b2c7833e 4.6.1726480610.b2c7833e 4.6.1726480610.b2c7833e 4.6.1726480610.b2c7833e OBS-URL: https://build.opensuse.org/package/show/devel:openQA:tested/openQA?expand=0&rev=1338 --- openQA-4.6.1726302328.1b03f55c.obscpio | 3 --- openQA-4.6.1726480610.b2c7833e.obscpio | 3 +++ openQA-client-test.spec | 2 +- openQA-devel-test.spec | 2 +- openQA-test.spec | 2 +- openQA-worker-test.spec | 2 +- openQA.changes | 7 +++++-- openQA.obsinfo | 6 +++--- openQA.spec | 22 ++++++++++++++++++++-- 9 files changed, 35 insertions(+), 14 deletions(-) delete mode 100644 openQA-4.6.1726302328.1b03f55c.obscpio create mode 100644 openQA-4.6.1726480610.b2c7833e.obscpio diff --git a/openQA-4.6.1726302328.1b03f55c.obscpio b/openQA-4.6.1726302328.1b03f55c.obscpio deleted file mode 100644 index 73018ab..0000000 --- a/openQA-4.6.1726302328.1b03f55c.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4a0cd2282c210fc5469e0edbb6827e5a0b9db302c5a1c7f21f856af96ef36abd -size 14667789 diff --git a/openQA-4.6.1726480610.b2c7833e.obscpio b/openQA-4.6.1726480610.b2c7833e.obscpio new file mode 100644 index 0000000..c73e0fc --- /dev/null +++ b/openQA-4.6.1726480610.b2c7833e.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:55203bc7f4683d5f67dcf622d1221f0d1ff0cef9ad8383b0a1085c0026dae838 +size 14668301 diff --git a/openQA-client-test.spec b/openQA-client-test.spec index b513d50..73a5e09 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.1726302328.1b03f55c +Version: 4.6.1726480610.b2c7833e 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 45970e8..b738543 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.1726302328.1b03f55c +Version: 4.6.1726480610.b2c7833e 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 fcb4f42..dcbf940 100644 --- a/openQA-test.spec +++ b/openQA-test.spec @@ -18,7 +18,7 @@ %define short_name openQA Name: %{short_name}-test -Version: 4.6.1726302328.1b03f55c +Version: 4.6.1726480610.b2c7833e 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 e0a7fc9..968a613 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.1726302328.1b03f55c +Version: 4.6.1726480610.b2c7833e Release: 0 Summary: Test package for %{short_name} License: GPL-2.0-or-later diff --git a/openQA.changes b/openQA.changes index 7691d0f..34fd5f3 100644 --- a/openQA.changes +++ b/openQA.changes @@ -1,8 +1,11 @@ ------------------------------------------------------------------- -Mon Sep 16 01:05:12 UTC 2024 - okurz@suse.com +Mon Sep 16 12:16:16 UTC 2024 - okurz@suse.com -- Update to version 4.6.1726302328.1b03f55c: +- Update to version 4.6.1726480610.b2c7833e: + * Ensure `tidyall` is available in CI after 28c5dd11f + * Apply tidy after 61be7039 * Ensure the error responsible for API failures is always added + * Exclude sub packages with many additional dependencies on SLE ------------------------------------------------------------------- Fri Sep 13 17:05:07 UTC 2024 - okurz@suse.com diff --git a/openQA.obsinfo b/openQA.obsinfo index 47d458b..f24b004 100644 --- a/openQA.obsinfo +++ b/openQA.obsinfo @@ -1,4 +1,4 @@ name: openQA -version: 4.6.1726302328.1b03f55c -mtime: 1726302328 -commit: 1b03f55c4bb5b56054affe2a8d3533a999489d57 +version: 4.6.1726480610.b2c7833e +mtime: 1726480610 +commit: b2c7833e5941a7872b388077c7b6bb1f1b5e5c94 diff --git a/openQA.spec b/openQA.spec index 15c86e4..6c82374 100644 --- a/openQA.spec +++ b/openQA.spec @@ -42,6 +42,14 @@ %else %bcond_without python_scripts %endif +# exclude additional sub packages that would pull in a lot of extra dependencies on SLE +%if 0%{?sle_version} && !0%{?is_opensuse} +%bcond_with devel_package +%bcond_with munin_package +%else +%bcond_without devel_package +%bcond_without munin_package +%endif # runtime requirements that also the testsuite needs %if %{with python_scripts} %define python_scripts_requires python3-base python3-requests openQA-client @@ -73,7 +81,7 @@ %define qemu qemu %endif # The following line is generated from dependencies.yaml -%define style_check_requires ShellCheck perl(Perl::Critic) perl(Perl::Critic::Freenode) python3-yamllint shfmt +%define style_check_requires ShellCheck perl(Code::TidyAll) perl(Perl::Critic) perl(Perl::Critic::Freenode) python3-yamllint shfmt # The following line is generated from dependencies.yaml %define cover_requires perl(Devel::Cover) perl(Devel::Cover::Report::Codecovbash) # The following line is generated from dependencies.yaml @@ -82,7 +90,7 @@ %define devel_requires %devel_no_selenium_requires chromedriver Name: openQA -Version: 4.6.1726302328.1b03f55c +Version: 4.6.1726480610.b2c7833e Release: 0 Summary: The openQA web-frontend, scheduler and tools License: GPL-2.0-or-later @@ -154,6 +162,7 @@ revision of the operating system, reporting the errors detected for each combination of hardware configuration, installation options and variant of the operating system. +%if %{with devel_package} %package no-selenium-devel Summary: Development package pulling in all build+test dependencies except chromedriver for Selenium based tests Requires: %{devel_no_selenium_requires} @@ -167,6 +176,7 @@ Requires: %{devel_requires} %description devel Development package pulling in all build+test dependencies. +%endif %package common Summary: The openQA common tools for web-frontend and workers @@ -288,6 +298,7 @@ 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. +%if %{with munin_package} %package munin Summary: Munin scripts Requires: curl @@ -298,6 +309,7 @@ Requires: perl %description munin Use this package to install munin scripts that allow to monitor some openQA statistics. +%endif %prep %setup -q @@ -384,10 +396,12 @@ ln -s %{_datadir}/openqa/script/openqa-label-all %{buildroot}%{_bindir}/openqa-l %endif # munin +%if %{with munin_package} 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 +%endif cd %{buildroot} grep -rl %{_bindir}/env . | while read file; do @@ -649,7 +663,9 @@ fi %{_sysusersdir}/geekotest.conf %endif +%if %{with devel_package} %files devel +%endif %files common %dir %{_datadir}/openqa @@ -783,6 +799,7 @@ fi %{_unitdir}/openqa-continuous-update.* %{_datadir}/openqa/script/openqa-continuous-update +%if %{with munin_package} %files munin %defattr(-,root,root) %doc contrib/munin/config/minion.config @@ -792,5 +809,6 @@ fi %dir %{_sysconfdir}/munin/plugin-conf.d %{_prefix}/lib/munin/plugins/openqa_minion_ %config(noreplace) %{_sysconfdir}/munin/plugin-conf.d/openqa-minion +%endif %changelog