diff --git a/openQA-4.6.1625604748.6b93c98dd.obscpio b/openQA-4.6.1625604748.6b93c98dd.obscpio deleted file mode 100644 index 6d7afd8..0000000 --- a/openQA-4.6.1625604748.6b93c98dd.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:91ff1db52eac847275d0844c3efbc23aa3f0f79ecd9f1502f358f1a10bd4a864 -size 13178893 diff --git a/openQA-4.6.1625814138.021a88a2a.obscpio b/openQA-4.6.1625814138.021a88a2a.obscpio new file mode 100644 index 0000000..c541efc --- /dev/null +++ b/openQA-4.6.1625814138.021a88a2a.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:65eebd2ca3fbf7a30bf73c15b282a04cebc6e50b6863002e1ebfe96e3e80daf1 +size 13194765 diff --git a/openQA-client-test.spec b/openQA-client-test.spec index 7295e75..e8218b0 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.1625604748.6b93c98dd +Version: 4.6.1625814138.021a88a2a 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 2ee4cbe..8952ac4 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.1625604748.6b93c98dd +Version: 4.6.1625814138.021a88a2a 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 0b1e8d2..ace825d 100644 --- a/openQA-test.spec +++ b/openQA-test.spec @@ -18,12 +18,16 @@ %define short_name openQA Name: %{short_name}-test -Version: 4.6.1625604748.6b93c98dd +Version: 4.6.1625814138.021a88a2a Release: 0 Summary: Test package for openQA License: GPL-2.0-or-later BuildRequires: %{short_name} == %{version} BuildRequires: openQA-local-db +%if 0%{?suse_version} > 1500 +BuildRequires: group(geekotest) +BuildRequires: user(geekotest) +%endif ExcludeArch: i586 %description @@ -38,6 +42,8 @@ touch %{_sourcedir}/%{short_name} # call one of the components but not openqa itself which would need a valid # configuration /usr/share/openqa/script/initdb --help +getent passwd geekotest +getent group geekotest %install # disable debug packages in package test to prevent error about missing files diff --git a/openQA-worker-test.spec b/openQA-worker-test.spec index 497101d..80c118b 100644 --- a/openQA-worker-test.spec +++ b/openQA-worker-test.spec @@ -18,11 +18,15 @@ %define short_name openQA-worker Name: %{short_name}-test -Version: 4.6.1625604748.6b93c98dd +Version: 4.6.1625814138.021a88a2a Release: 0 Summary: Test package for %{short_name} License: GPL-2.0-or-later BuildRequires: %{short_name} == %{version} +%if 0%{?suse_version} > 1500 +BuildRequires: group(_openqa-worker) +BuildRequires: user(_openqa-worker) +%endif ExcludeArch: i586 %description @@ -35,6 +39,8 @@ touch %{_sourcedir}/%{short_name} %build /usr/share/openqa/script/worker --help +getent passwd _openqa-worker +getent group _openqa-worker %install # disable debug packages in package test to prevent error about missing files diff --git a/openQA.changes b/openQA.changes index 3088884..6775037 100644 --- a/openQA.changes +++ b/openQA.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Fri Jul 09 08:24:15 UTC 2021 - coolo@suse.com + +- Update to version 4.6.1625814138.021a88a2a: + * t: Simplify "linked" lookup in 10-jobs.t + * t: Add test for happy-path of OpenQA::Worker::Engines::isotovideo::sync_tests + * OpenQA::Worker::Engines::isotovideo: Remove dead code "_kill" + * t: Increase timeouts + * Fix use of `isnt` in `t/lib/OpenQA/Test/Utils.pm` + * t: Bump timeout in more slow tests + * t: Bump timeout for ui/26-jobs_restart.t + * Distinguish comment types on /tests + * t: Bump timeout for deploy.t after recent slowdown + * Fix typos found by codespell + * Update parent_group link to test/overview to the new icon format + * Add link to /test/overview from index page for every parent group + * Add a check for the geekotest & _openqa-worker user to test specs + * Switch to systemd-sysusers instead of getent + useradd + * Mark uncovered line in OpenQA::Schema::Result::Assets + * Remove uncovered conditions for internal search of job settings + * Delete unused args special case handling in OpenQA::Schema::Result::GruTasks + * Simplify OpenQA::Schema::ResultSet::JobSettings + * Slightly simplify OpenQA::Schma::ResultSet::Assets for full statement coverage + * Slightly simplify OpenQA::Schma::ResultSet::AuditEvents for full statement coverage + * Do not fail Minion jobs when asset download fails due to a client error + ------------------------------------------------------------------- Wed Jul 07 00:24:13 UTC 2021 - coolo@suse.com diff --git a/openQA.obsinfo b/openQA.obsinfo index 41c0129..209cafc 100644 --- a/openQA.obsinfo +++ b/openQA.obsinfo @@ -1,5 +1,5 @@ name: openQA -version: 4.6.1625604748.6b93c98dd -mtime: 1625604748 -commit: 6b93c98ddee063e30a68bbc6b33684d073dee82b +version: 4.6.1625814138.021a88a2a +mtime: 1625814138 +commit: 021a88a2a6a3f37b340a4f9d1d9d281acd050c96 diff --git a/openQA.spec b/openQA.spec index 4a3e416..7270135 100644 --- a/openQA.spec +++ b/openQA.spec @@ -76,7 +76,7 @@ %define devel_requires %devel_no_selenium_requires chromedriver Name: openQA -Version: 4.6.1625604748.6b93c98dd +Version: 4.6.1625814138.021a88a2a Release: 0 Summary: The openQA web-frontend, scheduler and tools License: GPL-2.0-or-later @@ -121,6 +121,8 @@ BuildRequires: %{test_requires} %if 0%{?suse_version} >= 1330 Requires(pre): group(nogroup) %endif +BuildRequires: sysuser-tools +%sysusers_requires %description openQA is a testing framework that allows you to test GUI applications on one @@ -263,6 +265,8 @@ sed -e 's,/bin/env python,/bin/python,' -i script/openqa-label-all %build %make_build +%sysusers_generate_pre usr/lib/sysusers.d/%{name}-worker.conf %{name}-worker %{name}-worker.conf +%sysusers_generate_pre usr/lib/sysusers.d/geekotest.conf %{name} geekotest.conf %check #for double checking @@ -344,11 +348,7 @@ mkdir %{buildroot}%{_localstatedir}/lib/openqa/webui/cache # %fdupes %{buildroot}/%{_prefix} -%pre -if ! getent passwd geekotest > /dev/null; then - %{_sbindir}/useradd -r -g nogroup -c "openQA user" \ - -d %{_localstatedir}/lib/openqa geekotest 2>/dev/null || : -fi +%pre -f %{name}.pre %service_add_pre %{openqa_services} @@ -366,13 +366,7 @@ if [ "$1" = 1 ]; then fi fi -%pre worker -if ! getent passwd _openqa-worker > /dev/null; then - %{_sbindir}/useradd -r -g nogroup -c "openQA worker" \ - -d %{_localstatedir}/lib/empty _openqa-worker 2>/dev/null || : - # might fail for non-kvm workers (qemu package owns the group) - %{_sbindir}/usermod _openqa-worker -a -G kvm || : -fi +%pre worker -f openQA-worker.pre %service_add_pre %{openqa_worker_services} @@ -542,6 +536,7 @@ fi %dir %{_localstatedir}/lib/openqa/share/factory/repo %dir %{_localstatedir}/lib/openqa/share/factory/other %ghost %{_localstatedir}/log/openqa +%{_sysusersdir}/geekotest.conf %files devel @@ -606,6 +601,7 @@ fi %dir %{_localstatedir}/lib/openqa/cache # own one pool - to create the others is task of the admin %dir %{_localstatedir}/lib/openqa/pool/1 +%{_sysusersdir}/%{name}-worker.conf %files client %dir %{_datadir}/openqa