From 20c54018647a027034e2e34198163b099bbde914 Mon Sep 17 00:00:00 2001 From: okurz <> Date: Jun 06 2025 22:16:34 +0000 Subject: Update openQA to version 5.1749214996.3536da99 / rev 695 via SR 1283681 https://build.opensuse.org/request/show/1283681 by user okurz + anag_factory Update to 5.1749214996.3536da99 5.1749214996.3536da99 5.1749214996.3536da99 5.1749214996.3536da99 5.1749214996.3536da99 --- diff --git a/.files b/.files index e679746..9709330 100644 Binary files a/.files and b/.files differ diff --git a/.meta b/.meta index de19a58..c0c5680 100644 --- a/.meta +++ b/.meta @@ -1,5 +1,4 @@ <package name="openQA" project="openSUSE:Factory"> <title></title> <description></description> - <devel project="devel:openQA:tested" package="openQA"/> </package> diff --git a/.rev b/.rev index bc9e577..0761407 100644 --- a/.rev +++ b/.rev @@ -8089,4 +8089,16 @@ 5.1748615746.d50d8e24</comment> <requestid>1282031</requestid> </revision> + <revision rev="695" vrev="1"> + <srcmd5>fa07e7a13c649f710e8946b717163fa8</srcmd5> + <version>5.1749214996.3536da99</version> + <time>1749242701</time> + <user>anag_factory</user> + <comment>Update to 5.1749214996.3536da99 +5.1749214996.3536da99 +5.1749214996.3536da99 +5.1749214996.3536da99 +5.1749214996.3536da99</comment> + <requestid>1283681</requestid> + </revision> </revisionlist> diff --git a/node_modules.obscpio b/node_modules.obscpio index 7154f5f..606161a 120000 --- a/node_modules.obscpio +++ b/node_modules.obscpio @@ -1 +1 @@ -/ipfs/bafybeibxduokvxxajndsirwzxl2da4ytkhy524qzkfypvfdxumtqwhvnmm \ No newline at end of file +/ipfs/bafybeicljg3dtjtswpss6ejc4cbm4adzke43kve72ttgusf25lacnlps7i \ No newline at end of file diff --git a/node_modules.spec.inc b/node_modules.spec.inc index 1cc4397..f65dca9 100644 --- a/node_modules.spec.inc +++ b/node_modules.spec.inc @@ -4,7 +4,7 @@ Source1002: https://registry.npmjs.org/@eslint/config-array/-/config-arr Source1003: https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.2.tgz#/@eslint-config-helpers-0.2.2.tgz Source1004: https://registry.npmjs.org/@eslint/core/-/core-0.14.0.tgz#/@eslint-core-0.14.0.tgz Source1005: https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.1.tgz#/@eslint-eslintrc-3.3.1.tgz -Source1006: https://registry.npmjs.org/@eslint/js/-/js-9.27.0.tgz#/@eslint-js-9.27.0.tgz +Source1006: https://registry.npmjs.org/@eslint/js/-/js-9.28.0.tgz#/@eslint-js-9.28.0.tgz Source1007: https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz#/@eslint-object-schema-2.1.6.tgz Source1008: https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.1.tgz#/@eslint-plugin-kit-0.3.1.tgz Source1009: https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz#/@humanfs-core-0.19.1.tgz @@ -12,11 +12,11 @@ Source1010: https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz#/ Source1011: https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#/@humanwhocodes-module-importer-1.0.1.tgz Source1012: https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz#/@humanwhocodes-retry-0.3.1.tgz Source1013: https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.2.tgz#/@humanwhocodes-retry-0.4.2.tgz -Source1014: https://registry.npmjs.org/@pkgr/core/-/core-0.2.4.tgz#/@pkgr-core-0.2.4.tgz +Source1014: https://registry.npmjs.org/@pkgr/core/-/core-0.2.7.tgz#/@pkgr-core-0.2.7.tgz Source1015: https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz#/@popperjs-core-2.11.8.tgz -Source1016: https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz#/@types-estree-1.0.7.tgz +Source1016: https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz#/@types-estree-1.0.8.tgz Source1017: https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz#/@types-json-schema-7.0.15.tgz -Source1018: https://registry.npmjs.org/ace-builds/-/ace-builds-1.41.0.tgz#/ace-builds-1.41.0.tgz +Source1018: https://registry.npmjs.org/ace-builds/-/ace-builds-1.42.0.tgz#/ace-builds-1.42.0.tgz Source1019: https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz#/acorn-8.14.1.tgz Source1020: https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz#/acorn-jsx-5.3.2.tgz Source1021: https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz#/ajv-6.12.6.tgz @@ -73,7 +73,7 @@ Source1071: https://registry.npmjs.org/debug/-/debug-4.4.1.tgz#/debug-4. Source1072: https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz#/deep-is-0.1.4.tgz Source1073: https://registry.npmjs.org/delaunator/-/delaunator-5.0.1.tgz#/delaunator-5.0.1.tgz Source1074: https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#/escape-string-regexp-4.0.0.tgz -Source1075: https://registry.npmjs.org/eslint/-/eslint-9.27.0.tgz#/eslint-9.27.0.tgz +Source1075: https://registry.npmjs.org/eslint/-/eslint-9.28.0.tgz#/eslint-9.28.0.tgz Source1076: https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-10.1.5.tgz#/eslint-config-prettier-10.1.5.tgz Source1077: https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.4.1.tgz#/eslint-plugin-prettier-5.4.1.tgz Source1078: https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.3.0.tgz#/eslint-scope-8.3.0.tgz diff --git a/openQA-5.1748615746.d50d8e24.obscpio b/openQA-5.1748615746.d50d8e24.obscpio deleted file mode 120000 index eb233a6..0000000 --- a/openQA-5.1748615746.d50d8e24.obscpio +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafybeiawiiixbpiy6bi37ppmrbvmqrnnawhj2crowzqdxwbabh43eyto5i \ No newline at end of file diff --git a/openQA-5.1749214996.3536da99.obscpio b/openQA-5.1749214996.3536da99.obscpio new file mode 120000 index 0000000..512278a --- /dev/null +++ b/openQA-5.1749214996.3536da99.obscpio @@ -0,0 +1 @@ +/ipfs/bafybeiadpy35ypuifgqotbyq7hrchrfyk4zx2shw3tw75zoe7zu2voougm \ No newline at end of file diff --git a/openQA-client-test.spec b/openQA-client-test.spec index dc9c980..875a40f 100644 --- a/openQA-client-test.spec +++ b/openQA-client-test.spec @@ -1,7 +1,7 @@ # # spec file for package openQA-client-test # -# Copyright SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %define short_name openQA-client Name: %{short_name}-test -Version: 5.1748615746.d50d8e24 +Version: 5.1749214996.3536da99 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 0174601..fa5c73f 100644 --- a/openQA-devel-test.spec +++ b/openQA-devel-test.spec @@ -1,7 +1,7 @@ # # spec file for package openQA-devel-test # -# Copyright SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,12 +18,12 @@ %define short_name openQA-devel Name: %{short_name}-test -Version: 5.1748615746.d50d8e24 +Version: 5.1749214996.3536da99 Release: 0 Summary: Test package for %{short_name} License: GPL-2.0-or-later BuildRequires: %{short_name} == %{version} -ExcludeArch: %{ix86} +ExcludeArch: %{ix86} %ifarch ppc ppc64 ppc64le s390x # missing chromedriver dependency ExclusiveArch: do_not_build diff --git a/openQA-test.spec b/openQA-test.spec index f52d03c..ded3510 100644 --- a/openQA-test.spec +++ b/openQA-test.spec @@ -1,7 +1,7 @@ # # spec file for package openQA-test # -# Copyright SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %define short_name openQA Name: %{short_name}-test -Version: 5.1748615746.d50d8e24 +Version: 5.1749214996.3536da99 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 aa94386..2e6ec67 100644 --- a/openQA-worker-test.spec +++ b/openQA-worker-test.spec @@ -1,7 +1,7 @@ # # spec file for package openQA-worker-test # -# Copyright SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %define short_name openQA-worker Name: %{short_name}-test -Version: 5.1748615746.d50d8e24 +Version: 5.1749214996.3536da99 Release: 0 Summary: Test package for %{short_name} License: GPL-2.0-or-later diff --git a/openQA.changes b/openQA.changes index 03f9214..1ec703c 100644 --- a/openQA.changes +++ b/openQA.changes @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Fri Jun 06 13:51:38 UTC 2025 - okurz@suse.com + +- Update to version 5.1749214996.3536da99: + * Bump @types/estree from 1.0.7 to 1.0.8 + * Support sass generation in all product versions + * Avoid sporadic test failures due to warning about closed ws connection + * Increase chart testing verbosity for better log trace + * Bump ace-builds from 1.41.0 to 1.42.0 + * Bump eslint from 9.27.0 to 9.28.0 + * Bump @pkgr/core from 0.2.4 to 0.2.7 + * Remove nested .gitignore from openQA rpm + * Add permissions to avoid the warnings in openQA build + +------------------------------------------------------------------- Mon Jun 02 16:21:34 UTC 2025 - okurz@suse.com - Update to version 5.1748615746.d50d8e24: diff --git a/openQA.obsinfo b/openQA.obsinfo index 9a3fca2..5ed2e22 100644 --- a/openQA.obsinfo +++ b/openQA.obsinfo @@ -1,4 +1,4 @@ name: openQA -version: 5.1748615746.d50d8e24 -mtime: 1748615746 -commit: d50d8e2435b3f651391b441fcfaf593f5599f70a +version: 5.1749214996.3536da99 +mtime: 1749214996 +commit: 3536da995fac01d1abde149eae1a76bdc3728293 diff --git a/openQA.spec b/openQA.spec index 354ccbc..4cf1d44 100644 --- a/openQA.spec +++ b/openQA.spec @@ -1,7 +1,7 @@ # # spec file for package openQA # -# Copyright 2018-2020 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,10 +12,10 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -# can't use linebreaks here! + %define openqa_main_service openqa-webui.service %define openqa_extra_services 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-git-auto-update.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 openqa-enqueue-git-auto-update.timer openqa-enqueue-needle-ref-cleanup.service openqa-enqueue-needle-ref-cleanup.timer %define openqa_services %{openqa_main_service} %{openqa_extra_services} @@ -67,8 +67,15 @@ %define client_requires curl git-core jq perl(Getopt::Long::Descriptive) perl(IO::Socket::SSL) >= 2.009 perl(IPC::Run) perl(JSON::Validator) perl(LWP::Protocol::https) perl(LWP::UserAgent) perl(Test::More) perl(YAML::PP) >= 0.020 perl(YAML::XS) # The following line is generated from dependencies.yaml %define worker_requires bsdtar openQA-client optipng os-autoinst perl(Capture::Tiny) perl(File::Map) perl(Minion::Backend::SQLite) >= 5.0.7 perl(Mojo::IOLoop::ReadWriteProcess) >= 0.26 perl(Mojo::SQLite) psmisc sqlite3 >= 3.24.0 -# The following line is generated from dependencies.yaml +%if 0%{?suse_version} < 1570 +# SLE <= 15 has older Perl not providing a sufficiently recent +# ExtUtils::ParseXS needed by ExtUtils::CppGuess +# See https://progress.opensuse.org/issues/162500 for details %define build_requires %assetpack_requires npm rubygem(sass) >= 3.7.4 +%else +# The following line is generated from dependencies.yaml +%define build_requires %assetpack_requires npm perl(CSS::Sass) +%endif # All requirements needed by the tests executed during build-time. # Do not require on this in individual sub-packages except for the devel @@ -90,11 +97,11 @@ %define devel_requires %devel_no_selenium_requires chromedriver Name: openQA -Version: 5.1748615746.d50d8e24 +Version: 5.1749214996.3536da99 Release: 0 Summary: The openQA web-frontend, scheduler and tools License: GPL-2.0-or-later -Url: http://os-autoinst.github.io/openQA/ +URL: http://os-autoinst.github.io/openQA/ Source0: %{name}-%{version}.tar.xz Source2: node_modules.spec.inc %include %{_sourcedir}/node_modules.spec.inc @@ -109,10 +116,10 @@ BuildRequires: sles-release BuildRequires: %{build_requires} BuildRequires: apparmor-rpm-macros BuildRequires: local-npm-registry -Requires: perl(Minion) >= 10.0 Requires: %{main_requires} Requires: openQA-client = %{version} Requires: openQA-common = %{version} +Requires: perl(Minion) >= 10.0 # we need to have the same sha1 as expected %requires_eq perl-Mojolicious-Plugin-AssetPack Recommends: %{name}-local-db @@ -214,8 +221,8 @@ The openQA worker manages test engine (provided by os-autoinst package). %package client Summary: Client tools for remote openQA management -Requires: openQA-common = %{version} Requires: %client_requires +Requires: openQA-common = %{version} %description client Tools and support files for openQA client script. Client script is @@ -245,8 +252,8 @@ next to the webui. Summary: Convenience package for a single-instance setup using apache proxy Provides: %{name}-single-instance-apache Provides: %{name}-single-instance-apache2 -Requires: %{name}-local-db Requires: %{name} = %{version} +Requires: %{name}-local-db Requires: %{name}-worker = %{version} Requires: apache2 @@ -255,8 +262,8 @@ Use this package to setup a local instance with all services provided together. %package single-instance-nginx Summary: Convenience package for a single-instance setup using nginx proxy -Requires: %{name}-local-db Requires: %{name} = %{version} +Requires: %{name}-local-db Requires: %{name}-worker = %{version} Requires: nginx @@ -304,9 +311,9 @@ regardless of whether devel:openQA contains updates. %if %{with munin_package} %package munin Summary: Munin scripts +Requires: curl Requires: munin Requires: munin-node -Requires: curl Requires: perl %description munin @@ -314,7 +321,6 @@ Use this package to install munin scripts that allow to monitor some openQA statistics. %endif - %prep %setup -q sed -e 's,/bin/env python,/bin/python,' -i script/openqa-label-all @@ -427,6 +433,7 @@ install -m 0644 %{_sourcedir}/openQA.changes %{buildroot}%{_datadir}/openqa/publ %if 0%{?suse_version} > 1500 %pre -f %{name}.pre %else + %pre if ! getent passwd geekotest > /dev/null; then %{_sbindir}/useradd -r -g nogroup -c "openQA user" \ @@ -453,6 +460,7 @@ fi %if 0%{?suse_version} > 1500 %pre worker -f openQA-worker.pre %else + %pre worker if ! getent passwd _openqa-worker > /dev/null; then %{_sbindir}/useradd -r -g nogroup -c "openQA worker" \ @@ -713,7 +721,7 @@ fi %{_sbindir}/rcopenqa-slirpvde %{_sbindir}/rcopenqa-vde_switch %{_sbindir}/rcopenqa-worker -%ghost %config(noreplace) %{_sysconfdir}/openqa/workers.ini +%ghost %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/openqa/workers.ini %ghost %config(noreplace) %attr(0400,_openqa-worker,root) %{_sysconfdir}/openqa/client.conf %dir %{_sysconfdir}/openqa/workers.ini.d %dir %{_sysconfdir}/openqa/client.conf.d @@ -742,7 +750,7 @@ fi %{_datadir}/openqa/script/openqa-slirpvde %{_datadir}/openqa/script/openqa-vde_switch %{_tmpfilesdir}/openqa.conf -%ghost %dir %{_rundir}/openqa +%ghost %dir %attr(0755,_openqa-worker,root) %{_rundir}/openqa # worker libs %dir %{_datadir}/openqa %dir %{_datadir}/openqa/script