From 2c504bc0b277f9df00e3b47d0b75a76b49ed110c249e1bc2d46085471d517a02 Mon Sep 17 00:00:00 2001 From: Oliver Kurz Date: Thu, 11 Mar 2021 16:19:59 +0000 Subject: [PATCH] Offline generation of 4.6.1615465829.199a835ed 4.6.1615465829.199a835ed 4.6.1615465829.199a835ed 4.6.1615465829.199a835ed 4.6.1615465829.199a835ed OBS-URL: https://build.opensuse.org/package/show/devel:openQA:tested/openQA?expand=0&rev=605 --- openQA-4.6.1615196506.0b1531c35.obscpio | 3 --- openQA-4.6.1615465829.199a835ed.obscpio | 3 +++ openQA-client-test.spec | 2 +- openQA-devel-test.spec | 2 +- openQA-test.spec | 2 +- openQA-worker-test.spec | 2 +- openQA.changes | 25 +++++++++++++++++++++++++ openQA.obsinfo | 6 +++--- openQA.spec | 20 +++++++++++++++++++- 9 files changed, 54 insertions(+), 11 deletions(-) delete mode 100644 openQA-4.6.1615196506.0b1531c35.obscpio create mode 100644 openQA-4.6.1615465829.199a835ed.obscpio diff --git a/openQA-4.6.1615196506.0b1531c35.obscpio b/openQA-4.6.1615196506.0b1531c35.obscpio deleted file mode 100644 index 6e7e8c5..0000000 --- a/openQA-4.6.1615196506.0b1531c35.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8f7196515dfa049f6aeba4fa19758a23629c0e649381e93829abd1a8bfc4ef4b -size 12676621 diff --git a/openQA-4.6.1615465829.199a835ed.obscpio b/openQA-4.6.1615465829.199a835ed.obscpio new file mode 100644 index 0000000..977fb4c --- /dev/null +++ b/openQA-4.6.1615465829.199a835ed.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2ac72dab1af0d9a27ba1f15b5f29c72e9e2971e7ce5a7c799b091c38befefde3 +size 12818957 diff --git a/openQA-client-test.spec b/openQA-client-test.spec index 112ccb8..922af69 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.1615196506.0b1531c35 +Version: 4.6.1615465829.199a835ed 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 2683dff..956486c 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.1615196506.0b1531c35 +Version: 4.6.1615465829.199a835ed 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 458ab37..d1ca54d 100644 --- a/openQA-test.spec +++ b/openQA-test.spec @@ -18,7 +18,7 @@ %define short_name openQA Name: %{short_name}-test -Version: 4.6.1615196506.0b1531c35 +Version: 4.6.1615465829.199a835ed 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 99d30ed..196fb55 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.1615196506.0b1531c35 +Version: 4.6.1615465829.199a835ed Release: 0 Summary: Test package for %{short_name} License: GPL-2.0-or-later diff --git a/openQA.changes b/openQA.changes index 718b63d..f567353 100644 --- a/openQA.changes +++ b/openQA.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Thu Mar 11 16:19:37 UTC 2021 - coolo@suse.com + +- Update to version 4.6.1615465829.199a835ed: + * Package auto-update part on openSUSE only + * Update apparmor profile for git for openSUSE Tumbleweed since git moved from /usr/lib/git/ to /usr/libexec/git/ + * Dependency cron 2021-03-11 + * BuildRequires openSUSE-release only on openSUSE + * Test personal access tokens with an OpenID user + * Enable "fast lane" so jobs with prio 10 or higher are not blocked + * Adjust priorities of Minion jobs + * gru: Specify default-priority only at one place + * gru: Allow passing CLI options to Minion + * Personal access tokens need to compare the nickname + * Add static Dockerfile checks as in os-autoinst + * container: Fix all style issues reported by hadolint + * Document how to take out worker slots without interrupting running jobs + * Improve coding style in function to create user + * Adjust function for creating user to handle provider column + * Add auth provider column to users table to support multiple providers later + * Restore cover and run makefile targets + * Set an absolute path as PRODUCTDIR + * Don't create symlink when CASEDIR is an url address + * Symlink CASEDIR and set values to relative path + ------------------------------------------------------------------- Tue Mar 09 08:03:14 UTC 2021 - coolo@suse.com diff --git a/openQA.obsinfo b/openQA.obsinfo index f2f70df..f034b6c 100644 --- a/openQA.obsinfo +++ b/openQA.obsinfo @@ -1,5 +1,5 @@ name: openQA -version: 4.6.1615196506.0b1531c35 -mtime: 1615196506 -commit: 0b1531c352c415d0d8fb3d20cf22284ed193fd92 +version: 4.6.1615465829.199a835ed +mtime: 1615465829 +commit: 199a835ed813be327ffc52902295fb451b655ec7 diff --git a/openQA.spec b/openQA.spec index 7e4663b..790c8b1 100644 --- a/openQA.spec +++ b/openQA.spec @@ -76,7 +76,7 @@ %define devel_requires %devel_no_selenium_requires chromedriver Name: openQA -Version: 4.6.1615196506.0b1531c35 +Version: 4.6.1615465829.199a835ed Release: 0 Summary: The openQA web-frontend, scheduler and tools License: GPL-2.0-or-later @@ -88,8 +88,10 @@ Source0: %{name}-%{version}.tar.xz Source1: cache.txz Source101: update-cache.sh BuildRequires: fdupes +%if 0%{?is_opensuse} # for install-opensuse in Makefile BuildRequires: openSUSE-release +%endif BuildRequires: %{build_requires} Requires: %{main_requires} Requires: openQA-client = %{version} @@ -239,6 +241,7 @@ Group: Development/Tools/Other Documentation material covering installation, configuration, basic test writing, etc. Covering both openQA and also os-autoinst test engine. +%if 0%{?is_opensuse} %package auto-update Summary: Automatically upgrade and reboot the system when required Group: Development/Tools/Other @@ -248,6 +251,7 @@ Requires: rebootmgr %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. +%endif %prep %setup -q -a1 @@ -312,6 +316,10 @@ ln -s %{_datadir}/openqa/script/setup-db %{buildroot}%{_bindir}/openqa-setup-db %if %{with python_scripts} ln -s %{_datadir}/openqa/script/openqa-label-all %{buildroot}%{_bindir}/openqa-label-all %endif +%if !0%{is_opensuse} +# Drop auto-update part if not openSUSE +rm %{buildroot}%{_datadir}/openqa/script/openqa-auto-update +%endif cd %{buildroot} grep -rl %{_bindir}/env . | while read file; do @@ -364,8 +372,10 @@ fi %service_add_pre %{openqa_worker_services} +%if 0%{?is_opensuse} %pre auto-update %service_add_pre openqa-auto-update.timer +%endif %post %tmpfiles_create %{_tmpfilesdir}/openqa-webui.conf @@ -397,8 +407,10 @@ fi %tmpfiles_create %{_tmpfilesdir}/openqa.conf %service_add_post %{openqa_worker_services} +%if 0%{?is_opensuse} %post auto-update %service_add_post openqa-auto-update.timer +%endif %preun %service_del_preun %{openqa_services} @@ -406,9 +418,11 @@ fi %preun worker %service_del_preun %{openqa_worker_services} +%if 0%{?is_opensuse} %preun auto-update # not changing the service which might have triggered this update itself %service_del_preun openqa-auto-update.timer +%endif %postun %service_del_postun %{openqa_services} @@ -425,8 +439,10 @@ if [ -x /usr/bin/systemctl ] && [ $1 -ge 1 ]; then /usr/bin/systemctl reload 'openqa-worker-auto-restart@*.service' || : fi +%if 0%{?is_opensuse} %postun auto-update %service_del_postun openqa-auto-update.timer +%endif %post local-db %service_add_post openqa-setup-db.service @@ -637,9 +653,11 @@ fi %{_datadir}/openqa/script/openqa-bootstrap %{_datadir}/openqa/script/openqa-bootstrap-container +%if 0%{?is_opensuse} %files auto-update %dir %{_unitdir} %{_unitdir}/openqa-auto-update.* %{_datadir}/openqa/script/openqa-auto-update +%endif %changelog