From 9ea2892260236f3edfcff292f355570163d023ed9e1d3951f96b49d65b5599d7 Mon Sep 17 00:00:00 2001 From: Oliver Kurz Date: Sun, 2 Jul 2023 04:55:18 +0000 Subject: [PATCH] Offline generation of 4.6.1688124489.7f4be1c 4.6.1688124489.7f4be1c 4.6.1688124489.7f4be1c 4.6.1688124489.7f4be1c 4.6.1688124489.7f4be1c OBS-URL: https://build.opensuse.org/package/show/devel:openQA:tested/openQA?expand=0&rev=1048 --- openQA-4.6.1688038171.b33d284.obscpio | 3 --- openQA-4.6.1688124489.7f4be1c.obscpio | 3 +++ openQA-client-test.spec | 2 +- openQA-devel-test.spec | 2 +- openQA-test.spec | 2 +- openQA-worker-test.spec | 2 +- openQA.changes | 14 ++++++++++++++ openQA.obsinfo | 6 +++--- openQA.spec | 11 ++++++++--- 9 files changed, 32 insertions(+), 13 deletions(-) delete mode 100644 openQA-4.6.1688038171.b33d284.obscpio create mode 100644 openQA-4.6.1688124489.7f4be1c.obscpio diff --git a/openQA-4.6.1688038171.b33d284.obscpio b/openQA-4.6.1688038171.b33d284.obscpio deleted file mode 100644 index 620a27a..0000000 --- a/openQA-4.6.1688038171.b33d284.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:385df35d51a29eeed904f75effd1c69eaf5d6db8ba2952f057ea5b038d6ed08a -size 14343693 diff --git a/openQA-4.6.1688124489.7f4be1c.obscpio b/openQA-4.6.1688124489.7f4be1c.obscpio new file mode 100644 index 0000000..97fd0b6 --- /dev/null +++ b/openQA-4.6.1688124489.7f4be1c.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:18937e75d89a21d88420007910ab08b2a8381061203baf0c6444281bf781d642 +size 14344717 diff --git a/openQA-client-test.spec b/openQA-client-test.spec index 437daa8..d312e35 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.1688038171.b33d284 +Version: 4.6.1688124489.7f4be1c 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 aa3851f..d7d6c63 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.1688038171.b33d284 +Version: 4.6.1688124489.7f4be1c 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 7b2d7dd..13048be 100644 --- a/openQA-test.spec +++ b/openQA-test.spec @@ -18,7 +18,7 @@ %define short_name openQA Name: %{short_name}-test -Version: 4.6.1688038171.b33d284 +Version: 4.6.1688124489.7f4be1c 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 7eb6bc6..a721e83 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.1688038171.b33d284 +Version: 4.6.1688124489.7f4be1c Release: 0 Summary: Test package for %{short_name} License: GPL-2.0-or-later diff --git a/openQA.changes b/openQA.changes index 6b48f1d..4199b2b 100644 --- a/openQA.changes +++ b/openQA.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Sun Jul 02 04:54:54 UTC 2023 - okurz@suse.com + +- Update to version 4.6.1688124489.7f4be1c: + * Include nginx config in RPM + * Make sure munin config survives package update + * Consider devel mode test stable after recent changes + * Workaround line not being marked as covered + * Make it more obvious when devel mode fullstack test lacks files + * Fix race condition at the end of developer mode test + * Workaround sporadic failures of developer mode test + * De-duplicate code for re-login in devel mode test + * t: Reduce likelyhood of sporadic error about not logged in user + ------------------------------------------------------------------- Thu Jun 29 15:34:00 UTC 2023 - okurz@suse.com diff --git a/openQA.obsinfo b/openQA.obsinfo index 5552235..3e41083 100644 --- a/openQA.obsinfo +++ b/openQA.obsinfo @@ -1,4 +1,4 @@ name: openQA -version: 4.6.1688038171.b33d284 -mtime: 1688038171 -commit: b33d28482fb567537c99701a857f6e2086a3e2ce +version: 4.6.1688124489.7f4be1c +mtime: 1688124489 +commit: 7f4be1c1130bde86e1742e533c00b22f32190353 diff --git a/openQA.spec b/openQA.spec index 3d8072c..cda2a39 100644 --- a/openQA.spec +++ b/openQA.spec @@ -78,7 +78,7 @@ %define devel_requires %devel_no_selenium_requires chromedriver Name: openQA -Version: 4.6.1688038171.b33d284 +Version: 4.6.1688124489.7f4be1c Release: 0 Summary: The openQA web-frontend, scheduler and tools License: GPL-2.0-or-later @@ -460,7 +460,8 @@ if [ ! -e %{_localstatedir}/log/openqa ]; then fi if [ $1 -eq 1 ]; then - echo "### copy and edit %{_sysconfdir}/apache2/vhosts.d/openqa.conf.template!" + echo "### copy and edit %{_sysconfdir}/apache2/vhosts.d/openqa.conf.template if using apache!" + echo "### see %{_sysconfdir}/nginx/vhosts.d/openqa.conf if using nginx!" echo "### run sudo %{_datadir}/openqa/script/fetchneedles" else if [ -d "%{_localstatedir}/lib/openqa/share/testresults" ]; then @@ -554,6 +555,10 @@ fi %config %{_sysconfdir}/apache2/vhosts.d/openqa.conf.template %config %{_sysconfdir}/apache2/vhosts.d/openqa-common.inc %config %{_sysconfdir}/apache2/vhosts.d/openqa-ssl.conf.template +# nginx vhost +%dir %{_sysconfdir}/nginx +%dir %{_sysconfdir}/nginx/vhosts.d +%config %{_sysconfdir}/nginx/vhosts.d/openqa.conf # apparmor profile %dir %{_sysconfdir}/apparmor.d %config %{_sysconfdir}/apparmor.d/usr.share.openqa.script.openqa @@ -769,6 +774,6 @@ fi %dir %{_sysconfdir}/munin %dir %{_sysconfdir}/munin/plugin-conf.d %{_prefix}/lib/munin/plugins/openqa_minion_ -%{_sysconfdir}/munin/plugin-conf.d/openqa-minion +%config(noreplace) %{_sysconfdir}/munin/plugin-conf.d/openqa-minion %changelog