From 4c4a67bfae6ab19a6c3849eb79bf9597d0644eb2397664fb524a2031e2b6bf7a Mon Sep 17 00:00:00 2001 From: Oliver Kurz Date: Thu, 14 Apr 2022 17:49:39 +0000 Subject: [PATCH 1/2] Offline generation of 4.6.1649771313.af71e3071 4.6.1649771313.af71e3071 4.6.1649771313.af71e3071 4.6.1649771313.af71e3071 4.6.1649771313.af71e3071 OBS-URL: https://build.opensuse.org/package/show/devel:openQA:tested/openQA?expand=0&rev=780 --- openQA-4.6.1649753938.422b00b04.obscpio | 3 --- openQA-4.6.1649771313.af71e3071.obscpio | 3 +++ openQA-client-test.spec | 2 +- openQA-devel-test.spec | 2 +- openQA-test.spec | 2 +- openQA-worker-test.spec | 2 +- openQA.changes | 8 ++++++ openQA.obsinfo | 6 ++--- openQA.spec | 35 +++++++++++++++++++++++-- 9 files changed, 51 insertions(+), 12 deletions(-) delete mode 100644 openQA-4.6.1649753938.422b00b04.obscpio create mode 100644 openQA-4.6.1649771313.af71e3071.obscpio diff --git a/openQA-4.6.1649753938.422b00b04.obscpio b/openQA-4.6.1649753938.422b00b04.obscpio deleted file mode 100644 index 3f64ca4..0000000 --- a/openQA-4.6.1649753938.422b00b04.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ca57436df7c02376a68fe20f12045ba39c010b39964a323bec89f7d9552e41f5 -size 13208589 diff --git a/openQA-4.6.1649771313.af71e3071.obscpio b/openQA-4.6.1649771313.af71e3071.obscpio new file mode 100644 index 0000000..49ffb89 --- /dev/null +++ b/openQA-4.6.1649771313.af71e3071.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4ded0c09821bfed7afc927f28cfc5fe0116d93dd64f948d914537fc864466b59 +size 13212173 diff --git a/openQA-client-test.spec b/openQA-client-test.spec index 1f87bd7..a95f052 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.1649753938.422b00b04 +Version: 4.6.1649771313.af71e3071 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 9bd8900..328279e 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.1649753938.422b00b04 +Version: 4.6.1649771313.af71e3071 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 11965ca..2129374 100644 --- a/openQA-test.spec +++ b/openQA-test.spec @@ -18,7 +18,7 @@ %define short_name openQA Name: %{short_name}-test -Version: 4.6.1649753938.422b00b04 +Version: 4.6.1649771313.af71e3071 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 874b201..c0dd204 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.1649753938.422b00b04 +Version: 4.6.1649771313.af71e3071 Release: 0 Summary: Test package for %{short_name} License: GPL-2.0-or-later diff --git a/openQA.changes b/openQA.changes index 4951918..1867288 100644 --- a/openQA.changes +++ b/openQA.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Apr 14 17:49:23 UTC 2022 - okurz@suse.com + +- Update to version 4.6.1649771313.af71e3071: + * Add systemd unit to trigger continous deployment from devel:openQA + * apparmor: Allow podman to be called on workers + * Allow mutt in apparmor + ------------------------------------------------------------------- Tue Apr 12 09:49:15 UTC 2022 - okurz@suse.com diff --git a/openQA.obsinfo b/openQA.obsinfo index 5493471..01f0db6 100644 --- a/openQA.obsinfo +++ b/openQA.obsinfo @@ -1,4 +1,4 @@ name: openQA -version: 4.6.1649753938.422b00b04 -mtime: 1649753938 -commit: 422b00b044141ad1d4a9821f4efb0729ca136aec +version: 4.6.1649771313.af71e3071 +mtime: 1649771313 +commit: af71e30714c2a7857202d08d01e802e297efca17 diff --git a/openQA.spec b/openQA.spec index 913e854..675bacc 100644 --- a/openQA.spec +++ b/openQA.spec @@ -76,7 +76,7 @@ %define devel_requires %devel_no_selenium_requires chromedriver Name: openQA -Version: 4.6.1649753938.422b00b04 +Version: 4.6.1649771313.af71e3071 Release: 0 Summary: The openQA web-frontend, scheduler and tools License: GPL-2.0-or-later @@ -256,6 +256,7 @@ Covering both openQA and also os-autoinst test engine. %package auto-update Summary: Automatically upgrade and reboot the system when required Group: Development/Tools/Other +Requires: %{name}-common Requires: curl Requires: rebootmgr @@ -263,6 +264,18 @@ Requires: rebootmgr Use this package to install and enable a systemd service for nightly upgrading and rebooting the system if devel:openQA packages are stable. +%package continuous-update +Summary: Continuously update packages from devel:openQA +Group: Development/Tools/Other +Requires: %{name}-common +Requires: curl + +%description continuous-update +Use this package to install and enable a systemd service for continuously +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. + %prep %setup -q -a1 sed -e 's,/bin/env python,/bin/python,' -i script/openqa-label-all @@ -406,6 +419,9 @@ fi %pre auto-update %service_add_pre openqa-auto-update.timer +%pre continuous-update +%service_add_pre openqa-continuous-update.timer + %post %tmpfiles_create %{_tmpfilesdir}/openqa-webui.conf # install empty log file @@ -439,6 +455,9 @@ fi %post auto-update %service_add_post openqa-auto-update.timer +%post continuous-update +%service_add_post openqa-continuous-update.timer + %preun %service_del_preun %{openqa_services} @@ -449,6 +468,10 @@ fi # not changing the service which might have triggered this update itself %service_del_preun openqa-auto-update.timer +%preun continuous-update +# not changing the service which might have triggered this update itself +%service_del_preun openqa-continuous-update.timer + %postun %service_del_postun %{openqa_services} %restart_on_update apparmor @@ -467,6 +490,9 @@ fi %postun auto-update %service_del_postun openqa-auto-update.timer +%postun continuous-update +%service_del_postun openqa-continuous-update.timer + %post local-db %service_add_post openqa-setup-db.service @@ -595,6 +621,7 @@ fi %{_localstatedir}/lib/openqa/factory %{_localstatedir}/lib/openqa/script %{_localstatedir}/lib/openqa/tests +%{_datadir}/openqa/script/openqa-check-devel-repo %files worker %{_datadir}/openqa/lib/OpenQA/CacheService/ @@ -691,6 +718,10 @@ fi %dir %{_unitdir} %{_unitdir}/openqa-auto-update.* %{_datadir}/openqa/script/openqa-auto-update -%{_datadir}/openqa/script/openqa-check-devel-repo + +%files continuous-update +%dir %{_unitdir} +%{_unitdir}/openqa-continuous-update.* +%{_datadir}/openqa/script/openqa-continuous-update %changelog From 3a4fdfaed8fd622a7b79cf35d8f19f754b5b543004535c2a60678c7d430d2686 Mon Sep 17 00:00:00 2001 From: Oliver Kurz Date: Sun, 17 Apr 2022 01:49:33 +0000 Subject: [PATCH 2/2] Offline generation of 4.6.1650015172.429d07817 4.6.1650015172.429d07817 4.6.1650015172.429d07817 4.6.1650015172.429d07817 4.6.1650015172.429d07817 OBS-URL: https://build.opensuse.org/package/show/devel:openQA:tested/openQA?expand=0&rev=781 --- openQA-4.6.1649771313.af71e3071.obscpio | 3 --- openQA-4.6.1650015172.429d07817.obscpio | 3 +++ openQA-client-test.spec | 2 +- openQA-devel-test.spec | 2 +- openQA-test.spec | 2 +- openQA-worker-test.spec | 2 +- openQA.changes | 5 +++-- openQA.obsinfo | 6 +++--- openQA.spec | 2 +- 9 files changed, 14 insertions(+), 13 deletions(-) delete mode 100644 openQA-4.6.1649771313.af71e3071.obscpio create mode 100644 openQA-4.6.1650015172.429d07817.obscpio diff --git a/openQA-4.6.1649771313.af71e3071.obscpio b/openQA-4.6.1649771313.af71e3071.obscpio deleted file mode 100644 index 49ffb89..0000000 --- a/openQA-4.6.1649771313.af71e3071.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4ded0c09821bfed7afc927f28cfc5fe0116d93dd64f948d914537fc864466b59 -size 13212173 diff --git a/openQA-4.6.1650015172.429d07817.obscpio b/openQA-4.6.1650015172.429d07817.obscpio new file mode 100644 index 0000000..21df5b7 --- /dev/null +++ b/openQA-4.6.1650015172.429d07817.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bc1a040b1204b0741173eda9a4d1d188e7f2446f8a55d60f658047445790c2b3 +size 13212173 diff --git a/openQA-client-test.spec b/openQA-client-test.spec index a95f052..1be9d99 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.1649771313.af71e3071 +Version: 4.6.1650015172.429d07817 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 328279e..04bed65 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.1649771313.af71e3071 +Version: 4.6.1650015172.429d07817 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 2129374..6c8f63a 100644 --- a/openQA-test.spec +++ b/openQA-test.spec @@ -18,7 +18,7 @@ %define short_name openQA Name: %{short_name}-test -Version: 4.6.1649771313.af71e3071 +Version: 4.6.1650015172.429d07817 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 c0dd204..3070ee3 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.1649771313.af71e3071 +Version: 4.6.1650015172.429d07817 Release: 0 Summary: Test package for %{short_name} License: GPL-2.0-or-later diff --git a/openQA.changes b/openQA.changes index 1867288..0ca38b4 100644 --- a/openQA.changes +++ b/openQA.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- -Thu Apr 14 17:49:23 UTC 2022 - okurz@suse.com +Fri Apr 15 09:33:00 UTC 2022 - okurz@suse.com -- Update to version 4.6.1649771313.af71e3071: +- Update to version 4.6.1650015172.429d07817: + * Dependency cron 2022-04-15 * Add systemd unit to trigger continous deployment from devel:openQA * apparmor: Allow podman to be called on workers * Allow mutt in apparmor diff --git a/openQA.obsinfo b/openQA.obsinfo index 01f0db6..8650dc6 100644 --- a/openQA.obsinfo +++ b/openQA.obsinfo @@ -1,4 +1,4 @@ name: openQA -version: 4.6.1649771313.af71e3071 -mtime: 1649771313 -commit: af71e30714c2a7857202d08d01e802e297efca17 +version: 4.6.1650015172.429d07817 +mtime: 1650015172 +commit: 429d078172cf6dea1266733eafcff8d0d223c331 diff --git a/openQA.spec b/openQA.spec index 675bacc..a4f9636 100644 --- a/openQA.spec +++ b/openQA.spec @@ -76,7 +76,7 @@ %define devel_requires %devel_no_selenium_requires chromedriver Name: openQA -Version: 4.6.1649771313.af71e3071 +Version: 4.6.1650015172.429d07817 Release: 0 Summary: The openQA web-frontend, scheduler and tools License: GPL-2.0-or-later