diff --git a/openQA-4.6.1688565452.efc15ea.obscpio b/openQA-4.6.1688565452.efc15ea.obscpio deleted file mode 100644 index 65d4a2e..0000000 --- a/openQA-4.6.1688565452.efc15ea.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c3aeaec39bd99253e57c635c7ee2f25644dd985f3531de8891be211aad573b7d -size 14345229 diff --git a/openQA-4.6.1688760836.a3a5f95.obscpio b/openQA-4.6.1688760836.a3a5f95.obscpio new file mode 100644 index 0000000..db325e3 --- /dev/null +++ b/openQA-4.6.1688760836.a3a5f95.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ad4e4c41bd3f84104cc1efd937efa284503f39ec974e3623ba8e4ba1f4ed26ef +size 14347789 diff --git a/openQA-client-test.spec b/openQA-client-test.spec index 0ca5c0c..bf1f941 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.1688565452.efc15ea +Version: 4.6.1688760836.a3a5f95 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 8cc98dc..57c93df 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.1688565452.efc15ea +Version: 4.6.1688760836.a3a5f95 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 0a21159..9372c64 100644 --- a/openQA-test.spec +++ b/openQA-test.spec @@ -18,7 +18,7 @@ %define short_name openQA Name: %{short_name}-test -Version: 4.6.1688565452.efc15ea +Version: 4.6.1688760836.a3a5f95 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 779141e..faeb9f6 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.1688565452.efc15ea +Version: 4.6.1688760836.a3a5f95 Release: 0 Summary: Test package for %{short_name} License: GPL-2.0-or-later diff --git a/openQA.changes b/openQA.changes index 836a4b5..1d1d293 100644 --- a/openQA.changes +++ b/openQA.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sat Jul 08 04:22:57 UTC 2023 - okurz@suse.com + +- Update to version 4.6.1688760836.a3a5f95: + * Quote shell vars + * Remove unreachable shift statement from script arg parsing + * Convert script/configure-web-proxy from POSIX sh to bash + * Fix escaping in test tables + * Allow nginx setup via configure-web-proxy and openqa-bootstrap script + * Improved nginx config: Provide template and includes + * Extend install doc to cover nginx + ------------------------------------------------------------------- Wed Jul 05 20:22:47 UTC 2023 - okurz@suse.com diff --git a/openQA.obsinfo b/openQA.obsinfo index 23b282e..adf3065 100644 --- a/openQA.obsinfo +++ b/openQA.obsinfo @@ -1,4 +1,4 @@ name: openQA -version: 4.6.1688565452.efc15ea -mtime: 1688565452 -commit: efc15ea392c40f8960850906ed0a1f4681bf51f5 +version: 4.6.1688760836.a3a5f95 +mtime: 1688760836 +commit: a3a5f9574f30615972a1cfe55583a32f7eb6704a diff --git a/openQA.spec b/openQA.spec index d0754c7..65ac8f2 100644 --- a/openQA.spec +++ b/openQA.spec @@ -78,7 +78,7 @@ %define devel_requires %devel_no_selenium_requires chromedriver Name: openQA -Version: 4.6.1688565452.efc15ea +Version: 4.6.1688760836.a3a5f95 Release: 0 Summary: The openQA web-frontend, scheduler and tools License: GPL-2.0-or-later @@ -461,7 +461,7 @@ fi if [ $1 -eq 1 ]; then 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 "### copy and edit %{_sysconfdir}/nginx/vhosts.d/openqa.conf.template if using nginx!" echo "### run sudo %{_datadir}/openqa/script/fetchneedles" else if [ -d "%{_localstatedir}/lib/openqa/share/testresults" ]; then @@ -553,12 +553,14 @@ fi %dir %{_sysconfdir}/apache2 %dir %{_sysconfdir}/apache2/vhosts.d %config %{_sysconfdir}/apache2/vhosts.d/openqa.conf.template -%config %{_sysconfdir}/apache2/vhosts.d/openqa-common.inc +%config(noreplace) %{_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 +%config %{_sysconfdir}/nginx/vhosts.d/openqa.conf.template +%config(noreplace) %{_sysconfdir}/nginx/vhosts.d/openqa-locations.inc +%config(noreplace) %{_sysconfdir}/nginx/vhosts.d/openqa-upstreams.inc # apparmor profile %dir %{_sysconfdir}/apparmor.d %config %{_sysconfdir}/apparmor.d/usr.share.openqa.script.openqa