From 75618fe9ad368ae62bc4a11665f35b93fd216833623a64c784b62b61b7f73ee1 Mon Sep 17 00:00:00 2001 From: Oliver Kurz Date: Sat, 14 Nov 2020 08:16:59 +0000 Subject: [PATCH] Offline generation of 4.6.1605294814.ed6415c5a 4.6.1605294814.ed6415c5a 4.6.1605294814.ed6415c5a 4.6.1605294814.ed6415c5a 4.6.1605294814.ed6415c5a OBS-URL: https://build.opensuse.org/package/show/devel:openQA:tested/openQA?expand=0&rev=535 --- openQA-4.6.1605128979.b3fd45d8c.obscpio | 3 -- openQA-4.6.1605294814.ed6415c5a.obscpio | 3 ++ openQA-client-test.spec | 2 +- openQA-devel-test.spec | 2 +- openQA-test.spec | 2 +- openQA-worker-test.spec | 2 +- openQA.changes | 22 +++++++++++++++ openQA.obsinfo | 6 ++-- openQA.spec | 37 ++++++++++++++++++++++--- 9 files changed, 65 insertions(+), 14 deletions(-) delete mode 100644 openQA-4.6.1605128979.b3fd45d8c.obscpio create mode 100644 openQA-4.6.1605294814.ed6415c5a.obscpio diff --git a/openQA-4.6.1605128979.b3fd45d8c.obscpio b/openQA-4.6.1605128979.b3fd45d8c.obscpio deleted file mode 100644 index f28fcf0..0000000 --- a/openQA-4.6.1605128979.b3fd45d8c.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e10fc15c28491e3cd6cf8ea9923fb6714c1a9307bcef4908dff99b6e20d2421f -size 12599309 diff --git a/openQA-4.6.1605294814.ed6415c5a.obscpio b/openQA-4.6.1605294814.ed6415c5a.obscpio new file mode 100644 index 0000000..7c80aff --- /dev/null +++ b/openQA-4.6.1605294814.ed6415c5a.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:40e6ad1362b2a4d7858652fb19b41566fc3689433632efbec134401687dd3d37 +size 12605453 diff --git a/openQA-client-test.spec b/openQA-client-test.spec index 16ad38d..6c98c56 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.1605128979.b3fd45d8c +Version: 4.6.1605294814.ed6415c5a 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 41f812e..0b0fa95 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.1605128979.b3fd45d8c +Version: 4.6.1605294814.ed6415c5a 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 6e71d79..2814ed6 100644 --- a/openQA-test.spec +++ b/openQA-test.spec @@ -18,7 +18,7 @@ %define short_name openQA Name: %{short_name}-test -Version: 4.6.1605128979.b3fd45d8c +Version: 4.6.1605294814.ed6415c5a 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 de595c0..1656164 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.1605128979.b3fd45d8c +Version: 4.6.1605294814.ed6415c5a Release: 0 Summary: Test package for %{short_name} License: GPL-2.0-or-later diff --git a/openQA.changes b/openQA.changes index 16a2f3a..cc2f7bf 100644 --- a/openQA.changes +++ b/openQA.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Sat Nov 14 08:16:31 UTC 2020 - coolo@suse.com + +- Update to version 4.6.1605294814.ed6415c5a: + * Show parent group name and id when getting job details + * coverage: unconditional finished_handled timeout + * Make message about clone error unique + * Dependency cron 2020-11-13 + * t: Bump timeout of 44-scripts.t after we test more scripts + * Only install openSUSE specific files on openSUSE + * docs: Add documentation for auto-upgrade systemd timer + * docs: Order authentication sections in summary same as in text + * docs: Fix level of authentication subsections + * Add systemd timer for automatic system upgrades and reboots + * Makefile: Simplify systemd service setup + * Consider finalize jobs successful if the openQA job does not exist + * cache service: Avoid purging assets which are currently being downloaded + * docker: Simplify 'gzip ... | grep' to 'zgrep' + * Adapt codecov target to current coverage of 95% + * Delete old left-over db.sqlite file + * .gitignore: Delete obsolete full-stack.d entry + ------------------------------------------------------------------- Thu Nov 12 00:00:06 UTC 2020 - coolo@suse.com diff --git a/openQA.obsinfo b/openQA.obsinfo index c44582e..107902d 100644 --- a/openQA.obsinfo +++ b/openQA.obsinfo @@ -1,5 +1,5 @@ name: openQA -version: 4.6.1605128979.b3fd45d8c -mtime: 1605128979 -commit: b3fd45d8c26922589bb6538b5cbe47e8ca30427e +version: 4.6.1605294814.ed6415c5a +mtime: 1605294814 +commit: ed6415c5aec824ab66c5c879e74373cd376a0078 diff --git a/openQA.spec b/openQA.spec index c31a225..c384979 100644 --- a/openQA.spec +++ b/openQA.spec @@ -19,6 +19,7 @@ # can't use linebreaks here! %define openqa_services openqa-webui.service openqa-gru.service openqa-websockets.service openqa-scheduler.service openqa-enqueue-audit-event-cleanup.service openqa-enqueue-audit-event-cleanup.timer openqa-enqueue-asset-cleanup.service openqa-enqueue-asset-cleanup.timer openqa-enqueue-result-cleanup.service openqa-enqueue-result-cleanup.timer openqa-enqueue-bug-cleanup.service openqa-enqueue-bug-cleanup.timer %define openqa_worker_services openqa-worker.target openqa-slirpvde.service openqa-vde_switch.service openqa-worker-cacheservice.service openqa-worker-cacheservice-minion.service +%define openqa_auto_upgrade_services openqa-auto-upgrade.service openqa-auto-upgrade.timer %if %{undefined tmpfiles_create} %define tmpfiles_create() \ %{_bindir}/systemd-tmpfiles --create %{?*} || : \ @@ -56,7 +57,7 @@ # The following line is generated from dependencies.yaml %define client_requires curl git-core jq perl(Getopt::Long::Descriptive) perl(IO::Socket::SSL) >= 2.009 perl(IPC::Run) perl(JSON::Validator) perl(LWP::Protocol::https) perl(LWP::UserAgent) perl(Test::More) perl(YAML::PP) >= 0.020 perl(YAML::XS) # The following line is generated from dependencies.yaml -%define worker_requires openQA-client optipng os-autoinst < 5 perl(Minion::Backend::SQLite) >= 5.0.1 perl(Mojo::IOLoop::ReadWriteProcess) >= 0.26 perl(Mojo::SQLite) +%define worker_requires openQA-client optipng os-autoinst < 5 perl(Minion::Backend::SQLite) >= 5.0.1 perl(Mojo::IOLoop::ReadWriteProcess) >= 0.26 perl(Mojo::SQLite) sqlite3 >= 3.24.0 # The following line is generated from dependencies.yaml %define build_requires %assetpack_requires rubygem(sass) @@ -76,7 +77,7 @@ %define devel_requires %devel_no_selenium_requires chromedriver Name: openQA -Version: 4.6.1605128979.b3fd45d8c +Version: 4.6.1605294814.ed6415c5a Release: 0 Summary: The openQA web-frontend, scheduler and tools License: GPL-2.0-or-later @@ -87,8 +88,10 @@ Source0: %{name}-%{version}.tar.xz # use update-cache to update it Source1: cache.txz Source101: update-cache.sh -BuildRequires: %{build_requires} BuildRequires: fdupes +# for install-opensuse in Makefile +BuildRequires: %{build_requires} +BuildRequires: openSUSE-release Requires: %{main_requires} Requires: openQA-client = %{version} Requires: openQA-common = %{version} @@ -237,6 +240,16 @@ Group: Development/Tools/Other Documentation material covering installation, configuration, basic test writing, etc. Covering both openQA and also os-autoinst test engine. +%package auto-upgrade +Summary: Automatically upgrade and reboot the system when required +Group: Development/Tools/Other +Requires: curl +Requires: rebootmgr + +%description auto-upgrade +Use this package to install and enable a systemd service for nightly upgrading +and rebooting the system if devel:openQA packages are stable. + %prep %setup -q -a1 sed -e 's,/bin/env python,/bin/python,' -i script/openqa-label-all @@ -352,6 +365,9 @@ fi %service_add_pre %{openqa_worker_services} +%pre auto-upgrade +%service_add_pre %{openqa_auto_upgrade_services} + %post %tmpfiles_create %{_tmpfilesdir}/openqa-webui.conf # install empty log file @@ -382,12 +398,18 @@ fi %tmpfiles_create %{_tmpfilesdir}/openqa.conf %service_add_post %{openqa_worker_services} +%post auto-upgrade +%service_add_post %{openqa_auto_upgrade_services} + %preun %service_del_preun %{openqa_services} %preun worker %service_del_preun %{openqa_worker_services} +%preun auto-upgrade +%service_del_preun %{openqa_auto_upgrade_services} + %postun %service_del_postun %{openqa_services} %restart_on_update apparmor @@ -395,6 +417,9 @@ fi %postun worker %service_del_postun %{openqa_worker_services} +%postun auto-upgrade +%service_del_postun %{openqa_auto_upgrade_services} + %post local-db %service_add_post openqa-setup-db.service @@ -495,7 +520,6 @@ fi %dir %{_localstatedir}/lib/openqa/share/factory/hdd %dir %{_localstatedir}/lib/openqa/share/factory/repo %dir %{_localstatedir}/lib/openqa/share/factory/other -%ghost %{_localstatedir}/lib/openqa/db/db.sqlite %ghost %{_localstatedir}/log/openqa %files devel @@ -602,4 +626,9 @@ fi %{_datadir}/openqa/script/openqa-bootstrap %{_datadir}/openqa/script/openqa-bootstrap-container +%files auto-upgrade +%dir %{_unitdir} +%{_unitdir}/openqa-auto-upgrade.* +%{_datadir}/openqa/script/openqa-auto-upgrade + %changelog