Accepting request 1201415 from devel:openQA:tested
Update to 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/request/show/1201415 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openQA?expand=0&rev=620
This commit is contained in:
commit
0a6f3636d3
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:27cf63fdaabb18ae4af9e40610ea2c4256fd3ec02bfb0dc36283f3dedbec3fec
|
|
||||||
size 14667277
|
|
3
openQA-4.6.1726480610.b2c7833e.obscpio
Normal file
3
openQA-4.6.1726480610.b2c7833e.obscpio
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:55203bc7f4683d5f67dcf622d1221f0d1ff0cef9ad8383b0a1085c0026dae838
|
||||||
|
size 14668301
|
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
%define short_name openQA-client
|
%define short_name openQA-client
|
||||||
Name: %{short_name}-test
|
Name: %{short_name}-test
|
||||||
Version: 4.6.1726234723.b54d8ce9
|
Version: 4.6.1726480610.b2c7833e
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Test package for %{short_name}
|
Summary: Test package for %{short_name}
|
||||||
License: GPL-2.0-or-later
|
License: GPL-2.0-or-later
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
%define short_name openQA-devel
|
%define short_name openQA-devel
|
||||||
Name: %{short_name}-test
|
Name: %{short_name}-test
|
||||||
Version: 4.6.1726234723.b54d8ce9
|
Version: 4.6.1726480610.b2c7833e
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Test package for %{short_name}
|
Summary: Test package for %{short_name}
|
||||||
License: GPL-2.0-or-later
|
License: GPL-2.0-or-later
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
%define short_name openQA
|
%define short_name openQA
|
||||||
Name: %{short_name}-test
|
Name: %{short_name}-test
|
||||||
Version: 4.6.1726234723.b54d8ce9
|
Version: 4.6.1726480610.b2c7833e
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Test package for openQA
|
Summary: Test package for openQA
|
||||||
License: GPL-2.0-or-later
|
License: GPL-2.0-or-later
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
%define short_name openQA-worker
|
%define short_name openQA-worker
|
||||||
Name: %{short_name}-test
|
Name: %{short_name}-test
|
||||||
Version: 4.6.1726234723.b54d8ce9
|
Version: 4.6.1726480610.b2c7833e
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Test package for %{short_name}
|
Summary: Test package for %{short_name}
|
||||||
License: GPL-2.0-or-later
|
License: GPL-2.0-or-later
|
||||||
|
@ -1,3 +1,12 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Sep 16 12:16:16 UTC 2024 - okurz@suse.com
|
||||||
|
|
||||||
|
- 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
|
Fri Sep 13 17:05:07 UTC 2024 - okurz@suse.com
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
name: openQA
|
name: openQA
|
||||||
version: 4.6.1726234723.b54d8ce9
|
version: 4.6.1726480610.b2c7833e
|
||||||
mtime: 1726234723
|
mtime: 1726480610
|
||||||
commit: b54d8ce9e4ccddd3c339b5fb0b596ff846f54418
|
commit: b2c7833e5941a7872b388077c7b6bb1f1b5e5c94
|
||||||
|
22
openQA.spec
22
openQA.spec
@ -42,6 +42,14 @@
|
|||||||
%else
|
%else
|
||||||
%bcond_without python_scripts
|
%bcond_without python_scripts
|
||||||
%endif
|
%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
|
# runtime requirements that also the testsuite needs
|
||||||
%if %{with python_scripts}
|
%if %{with python_scripts}
|
||||||
%define python_scripts_requires python3-base python3-requests openQA-client
|
%define python_scripts_requires python3-base python3-requests openQA-client
|
||||||
@ -73,7 +81,7 @@
|
|||||||
%define qemu qemu
|
%define qemu qemu
|
||||||
%endif
|
%endif
|
||||||
# The following line is generated from dependencies.yaml
|
# 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
|
# The following line is generated from dependencies.yaml
|
||||||
%define cover_requires perl(Devel::Cover) perl(Devel::Cover::Report::Codecovbash)
|
%define cover_requires perl(Devel::Cover) perl(Devel::Cover::Report::Codecovbash)
|
||||||
# The following line is generated from dependencies.yaml
|
# The following line is generated from dependencies.yaml
|
||||||
@ -82,7 +90,7 @@
|
|||||||
%define devel_requires %devel_no_selenium_requires chromedriver
|
%define devel_requires %devel_no_selenium_requires chromedriver
|
||||||
|
|
||||||
Name: openQA
|
Name: openQA
|
||||||
Version: 4.6.1726234723.b54d8ce9
|
Version: 4.6.1726480610.b2c7833e
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: The openQA web-frontend, scheduler and tools
|
Summary: The openQA web-frontend, scheduler and tools
|
||||||
License: GPL-2.0-or-later
|
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
|
combination of hardware configuration, installation options and variant of the
|
||||||
operating system.
|
operating system.
|
||||||
|
|
||||||
|
%if %{with devel_package}
|
||||||
%package no-selenium-devel
|
%package no-selenium-devel
|
||||||
Summary: Development package pulling in all build+test dependencies except chromedriver for Selenium based tests
|
Summary: Development package pulling in all build+test dependencies except chromedriver for Selenium based tests
|
||||||
Requires: %{devel_no_selenium_requires}
|
Requires: %{devel_no_selenium_requires}
|
||||||
@ -167,6 +176,7 @@ Requires: %{devel_requires}
|
|||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
Development package pulling in all build+test dependencies.
|
Development package pulling in all build+test dependencies.
|
||||||
|
%endif
|
||||||
|
|
||||||
%package common
|
%package common
|
||||||
Summary: The openQA common tools for web-frontend and workers
|
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
|
is complementary to auto-update which also reboots the system and does updates
|
||||||
regardless of whether devel:openQA contains updates.
|
regardless of whether devel:openQA contains updates.
|
||||||
|
|
||||||
|
%if %{with munin_package}
|
||||||
%package munin
|
%package munin
|
||||||
Summary: Munin scripts
|
Summary: Munin scripts
|
||||||
Requires: curl
|
Requires: curl
|
||||||
@ -298,6 +309,7 @@ Requires: perl
|
|||||||
%description munin
|
%description munin
|
||||||
Use this package to install munin scripts that allow to monitor some openQA
|
Use this package to install munin scripts that allow to monitor some openQA
|
||||||
statistics.
|
statistics.
|
||||||
|
%endif
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
@ -384,10 +396,12 @@ ln -s %{_datadir}/openqa/script/openqa-label-all %{buildroot}%{_bindir}/openqa-l
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
# munin
|
# munin
|
||||||
|
%if %{with munin_package}
|
||||||
install -d -m 755 %{buildroot}/%{_prefix}/lib/munin/plugins
|
install -d -m 755 %{buildroot}/%{_prefix}/lib/munin/plugins
|
||||||
install -m 755 contrib/munin/plugins/minion %{buildroot}/%{_prefix}/lib/munin/plugins/openqa_minion_
|
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 -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
|
install -m 644 contrib/munin/config/minion.config %{buildroot}/%{_sysconfdir}/munin/plugin-conf.d/openqa-minion
|
||||||
|
%endif
|
||||||
|
|
||||||
cd %{buildroot}
|
cd %{buildroot}
|
||||||
grep -rl %{_bindir}/env . | while read file; do
|
grep -rl %{_bindir}/env . | while read file; do
|
||||||
@ -649,7 +663,9 @@ fi
|
|||||||
%{_sysusersdir}/geekotest.conf
|
%{_sysusersdir}/geekotest.conf
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%if %{with devel_package}
|
||||||
%files devel
|
%files devel
|
||||||
|
%endif
|
||||||
|
|
||||||
%files common
|
%files common
|
||||||
%dir %{_datadir}/openqa
|
%dir %{_datadir}/openqa
|
||||||
@ -783,6 +799,7 @@ fi
|
|||||||
%{_unitdir}/openqa-continuous-update.*
|
%{_unitdir}/openqa-continuous-update.*
|
||||||
%{_datadir}/openqa/script/openqa-continuous-update
|
%{_datadir}/openqa/script/openqa-continuous-update
|
||||||
|
|
||||||
|
%if %{with munin_package}
|
||||||
%files munin
|
%files munin
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%doc contrib/munin/config/minion.config
|
%doc contrib/munin/config/minion.config
|
||||||
@ -792,5 +809,6 @@ fi
|
|||||||
%dir %{_sysconfdir}/munin/plugin-conf.d
|
%dir %{_sysconfdir}/munin/plugin-conf.d
|
||||||
%{_prefix}/lib/munin/plugins/openqa_minion_
|
%{_prefix}/lib/munin/plugins/openqa_minion_
|
||||||
%config(noreplace) %{_sysconfdir}/munin/plugin-conf.d/openqa-minion
|
%config(noreplace) %{_sysconfdir}/munin/plugin-conf.d/openqa-minion
|
||||||
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
Loading…
x
Reference in New Issue
Block a user