diff --git a/openQA-4.6.1605294814.ed6415c5a.obscpio b/openQA-4.6.1605294814.ed6415c5a.obscpio deleted file mode 100644 index 7c80aff..0000000 --- a/openQA-4.6.1605294814.ed6415c5a.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:40e6ad1362b2a4d7858652fb19b41566fc3689433632efbec134401687dd3d37 -size 12605453 diff --git a/openQA-4.6.1605530208.6b910f3fc.obscpio b/openQA-4.6.1605530208.6b910f3fc.obscpio new file mode 100644 index 0000000..405d20f --- /dev/null +++ b/openQA-4.6.1605530208.6b910f3fc.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dd622a9c6db9b1d47e513653d00638735a94c1bdb5ff50b25b8e3cdb1404fc01 +size 12605453 diff --git a/openQA-client-test.spec b/openQA-client-test.spec index 6c98c56..1c35195 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.1605294814.ed6415c5a +Version: 4.6.1605530208.6b910f3fc 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 0b0fa95..37cdb30 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.1605294814.ed6415c5a +Version: 4.6.1605530208.6b910f3fc 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 2814ed6..69f2231 100644 --- a/openQA-test.spec +++ b/openQA-test.spec @@ -18,7 +18,7 @@ %define short_name openQA Name: %{short_name}-test -Version: 4.6.1605294814.ed6415c5a +Version: 4.6.1605530208.6b910f3fc 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 1656164..2dd8705 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.1605294814.ed6415c5a +Version: 4.6.1605530208.6b910f3fc Release: 0 Summary: Test package for %{short_name} License: GPL-2.0-or-later diff --git a/openQA.changes b/openQA.changes index cc2f7bf..acebee4 100644 --- a/openQA.changes +++ b/openQA.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Nov 16 16:40:23 UTC 2020 - coolo@suse.com + +- Update to version 4.6.1605530208.6b910f3fc: + * Use consistent "auto-update" instead of "auto-ugrade" + * systemd: Fix wrong ExecStart path in openqa-auto-upgrade + * docker: Fix web UI Dockerfile-lb to be buildable on OBS + ------------------------------------------------------------------- Sat Nov 14 08:16:31 UTC 2020 - coolo@suse.com diff --git a/openQA.obsinfo b/openQA.obsinfo index 107902d..1effe9b 100644 --- a/openQA.obsinfo +++ b/openQA.obsinfo @@ -1,5 +1,5 @@ name: openQA -version: 4.6.1605294814.ed6415c5a -mtime: 1605294814 -commit: ed6415c5aec824ab66c5c879e74373cd376a0078 +version: 4.6.1605530208.6b910f3fc +mtime: 1605530208 +commit: 6b910f3fc6d2f95d3d4fdfb8fa76eb66af15aa27 diff --git a/openQA.spec b/openQA.spec index c384979..1008218 100644 --- a/openQA.spec +++ b/openQA.spec @@ -19,7 +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 +%define openqa_auto_upgrade_services openqa-auto-update.service openqa-auto-update.timer %if %{undefined tmpfiles_create} %define tmpfiles_create() \ %{_bindir}/systemd-tmpfiles --create %{?*} || : \ @@ -77,7 +77,7 @@ %define devel_requires %devel_no_selenium_requires chromedriver Name: openQA -Version: 4.6.1605294814.ed6415c5a +Version: 4.6.1605530208.6b910f3fc Release: 0 Summary: The openQA web-frontend, scheduler and tools License: GPL-2.0-or-later @@ -240,13 +240,13 @@ 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 +%package auto-update Summary: Automatically upgrade and reboot the system when required Group: Development/Tools/Other Requires: curl Requires: rebootmgr -%description auto-upgrade +%description auto-update Use this package to install and enable a systemd service for nightly upgrading and rebooting the system if devel:openQA packages are stable. @@ -365,7 +365,7 @@ fi %service_add_pre %{openqa_worker_services} -%pre auto-upgrade +%pre auto-update %service_add_pre %{openqa_auto_upgrade_services} %post @@ -398,7 +398,7 @@ fi %tmpfiles_create %{_tmpfilesdir}/openqa.conf %service_add_post %{openqa_worker_services} -%post auto-upgrade +%post auto-update %service_add_post %{openqa_auto_upgrade_services} %preun @@ -407,7 +407,7 @@ fi %preun worker %service_del_preun %{openqa_worker_services} -%preun auto-upgrade +%preun auto-update %service_del_preun %{openqa_auto_upgrade_services} %postun @@ -417,7 +417,7 @@ fi %postun worker %service_del_postun %{openqa_worker_services} -%postun auto-upgrade +%postun auto-update %service_del_postun %{openqa_auto_upgrade_services} %post local-db @@ -626,9 +626,9 @@ fi %{_datadir}/openqa/script/openqa-bootstrap %{_datadir}/openqa/script/openqa-bootstrap-container -%files auto-upgrade +%files auto-update %dir %{_unitdir} -%{_unitdir}/openqa-auto-upgrade.* -%{_datadir}/openqa/script/openqa-auto-upgrade +%{_unitdir}/openqa-auto-update.* +%{_datadir}/openqa/script/openqa-auto-update %changelog