From 0f14850f9b18d91e1acb2aebcabe1c514a3085d2c86493471d8923f74fae4b37 Mon Sep 17 00:00:00 2001 From: Oliver Kurz Date: Sun, 21 Jul 2019 00:27:59 +0000 Subject: [PATCH] Offline generation of 4.6.1563545889.6a8f9a53 4.6.1563545889.6a8f9a53 4.6.1563545889.6a8f9a53 OBS-URL: https://build.opensuse.org/package/show/devel:openQA:tested/openQA?expand=0&rev=246 --- openQA-4.6.1563452417.5a40564d.obscpio | 3 --- openQA-4.6.1563545889.6a8f9a53.obscpio | 3 +++ openQA-test.changes | 23 +++++++++++++++++++++-- openQA-test.spec | 2 +- openQA-worker-test.changes | 23 +++++++++++++++++++++-- openQA-worker-test.spec | 2 +- openQA.changes | 23 +++++++++++++++++++++-- openQA.obsinfo | 6 +++--- openQA.spec | 21 ++++++++++++++++++++- 9 files changed, 91 insertions(+), 15 deletions(-) delete mode 100644 openQA-4.6.1563452417.5a40564d.obscpio create mode 100644 openQA-4.6.1563545889.6a8f9a53.obscpio diff --git a/openQA-4.6.1563452417.5a40564d.obscpio b/openQA-4.6.1563452417.5a40564d.obscpio deleted file mode 100644 index d530cb0..0000000 --- a/openQA-4.6.1563452417.5a40564d.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1297b68000c8db4e416bb8523d04298293d54303a0bb41b2cef60a22ad244cd1 -size 9764877 diff --git a/openQA-4.6.1563545889.6a8f9a53.obscpio b/openQA-4.6.1563545889.6a8f9a53.obscpio new file mode 100644 index 0000000..5aa145a --- /dev/null +++ b/openQA-4.6.1563545889.6a8f9a53.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa7f216254cfe7437ee2151e23c6d362d1f097366fddb975c9fd2f1567a1e481 +size 9790477 diff --git a/openQA-test.changes b/openQA-test.changes index 0093b4d..f3027a8 100644 --- a/openQA-test.changes +++ b/openQA-test.changes @@ -1,12 +1,23 @@ ------------------------------------------------------------------- -Thu Jul 18 16:28:15 UTC 2019 - coolo@suse.com +Sat Jul 20 18:51:06 UTC 2019 - coolo@suse.com -- Update to version 4.6.1563452417.5a40564d: +- Update to version 4.6.1563545889.6a8f9a53: + * spec: Fix SLE12 build with patched out python subpackage + * Start a documentation section on how to build openQA plugins + * templates: Update references to documentation in help texts + * docs: Update references to target versions in our issue tracker + * Document adding new dependencies + * Improve doc section about starting webserver from Git + * Move testing with production data to database section + * Improve documentation about OPENQA_BASEDIR + * Replay cmds in devel mode console only if connected to os-autoinst * Make sure all four levels of API access have named routes for plugins and tests + * Add undef to return * Prevent cleaning pool directory in worker availability check * Add helper script 'openqa-label-all' * Set log for failing to stop cmd srv to info level * Do not fail fullstack test when connection closed + * Split api request to own route * Extend unit tests for OpenQA::Worker * Do not stop current job twice when stopping during setup * Remove unused function from worker @@ -15,9 +26,17 @@ Thu Jul 18 16:28:15 UTC 2019 - coolo@suse.com * Give the API authentication routes plugins will use names and test them * Log sent commands in the developer console as well * Replay commands send though developer console while offline + * Add put method with disabled test * Fix test doing an equality check on an exception instead of a regular expression comparison + * Fix html * Adapt codecov target to current coverage + * Small tweaks * Default to HTTPS instead of HTTP with openqa-client + * Add Operator menu item + * Remove duplicate use + * Small CR adjustment + * Make routes restricted + * Add ObsRsync plugin * .travis.yml: Save travis CI some testing time * Add Test::More based error handler to SeleniumTest diff --git a/openQA-test.spec b/openQA-test.spec index 6141bdd..ddeb221 100644 --- a/openQA-test.spec +++ b/openQA-test.spec @@ -18,7 +18,7 @@ %define short_name openQA Name: %{short_name}-test -Version: 4.6.1563452417.5a40564d +Version: 4.6.1563545889.6a8f9a53 Release: 0 Summary: Test package for openQA License: GPL-2.0-or-later diff --git a/openQA-worker-test.changes b/openQA-worker-test.changes index e8b0c16..c37162d 100644 --- a/openQA-worker-test.changes +++ b/openQA-worker-test.changes @@ -1,12 +1,23 @@ ------------------------------------------------------------------- -Thu Jul 18 16:28:15 UTC 2019 - coolo@suse.com +Sat Jul 20 18:51:06 UTC 2019 - coolo@suse.com -- Update to version 4.6.1563452417.5a40564d: +- Update to version 4.6.1563545889.6a8f9a53: + * spec: Fix SLE12 build with patched out python subpackage + * Start a documentation section on how to build openQA plugins + * templates: Update references to documentation in help texts + * docs: Update references to target versions in our issue tracker + * Document adding new dependencies + * Improve doc section about starting webserver from Git + * Move testing with production data to database section + * Improve documentation about OPENQA_BASEDIR + * Replay cmds in devel mode console only if connected to os-autoinst * Make sure all four levels of API access have named routes for plugins and tests + * Add undef to return * Prevent cleaning pool directory in worker availability check * Add helper script 'openqa-label-all' * Set log for failing to stop cmd srv to info level * Do not fail fullstack test when connection closed + * Split api request to own route * Extend unit tests for OpenQA::Worker * Do not stop current job twice when stopping during setup * Remove unused function from worker @@ -15,9 +26,17 @@ Thu Jul 18 16:28:15 UTC 2019 - coolo@suse.com * Give the API authentication routes plugins will use names and test them * Log sent commands in the developer console as well * Replay commands send though developer console while offline + * Add put method with disabled test * Fix test doing an equality check on an exception instead of a regular expression comparison + * Fix html * Adapt codecov target to current coverage + * Small tweaks * Default to HTTPS instead of HTTP with openqa-client + * Add Operator menu item + * Remove duplicate use + * Small CR adjustment + * Make routes restricted + * Add ObsRsync plugin * .travis.yml: Save travis CI some testing time * Add Test::More based error handler to SeleniumTest diff --git a/openQA-worker-test.spec b/openQA-worker-test.spec index 288c90b..201c472 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.1563452417.5a40564d +Version: 4.6.1563545889.6a8f9a53 Release: 0 Summary: Test package for %{short_name} License: GPL-2.0-or-later diff --git a/openQA.changes b/openQA.changes index 3881310..b6fc486 100644 --- a/openQA.changes +++ b/openQA.changes @@ -1,12 +1,23 @@ ------------------------------------------------------------------- -Thu Jul 18 16:28:15 UTC 2019 - coolo@suse.com +Sat Jul 20 18:51:06 UTC 2019 - coolo@suse.com -- Update to version 4.6.1563452417.5a40564d: +- Update to version 4.6.1563545889.6a8f9a53: + * spec: Fix SLE12 build with patched out python subpackage + * Start a documentation section on how to build openQA plugins + * templates: Update references to documentation in help texts + * docs: Update references to target versions in our issue tracker + * Document adding new dependencies + * Improve doc section about starting webserver from Git + * Move testing with production data to database section + * Improve documentation about OPENQA_BASEDIR + * Replay cmds in devel mode console only if connected to os-autoinst * Make sure all four levels of API access have named routes for plugins and tests + * Add undef to return * Prevent cleaning pool directory in worker availability check * Add helper script 'openqa-label-all' * Set log for failing to stop cmd srv to info level * Do not fail fullstack test when connection closed + * Split api request to own route * Extend unit tests for OpenQA::Worker * Do not stop current job twice when stopping during setup * Remove unused function from worker @@ -15,9 +26,17 @@ Thu Jul 18 16:28:15 UTC 2019 - coolo@suse.com * Give the API authentication routes plugins will use names and test them * Log sent commands in the developer console as well * Replay commands send though developer console while offline + * Add put method with disabled test * Fix test doing an equality check on an exception instead of a regular expression comparison + * Fix html * Adapt codecov target to current coverage + * Small tweaks * Default to HTTPS instead of HTTP with openqa-client + * Add Operator menu item + * Remove duplicate use + * Small CR adjustment + * Make routes restricted + * Add ObsRsync plugin * .travis.yml: Save travis CI some testing time * Add Test::More based error handler to SeleniumTest diff --git a/openQA.obsinfo b/openQA.obsinfo index 9a1c774..cd15e5b 100644 --- a/openQA.obsinfo +++ b/openQA.obsinfo @@ -1,5 +1,5 @@ name: openQA -version: 4.6.1563452417.5a40564d -mtime: 1563452417 -commit: 5a40564d90ba614e1eba72b548eb6b88309418aa +version: 4.6.1563545889.6a8f9a53 +mtime: 1563545889 +commit: 6a8f9a539c79f3c08d3ed3bfe6169032008f5116 diff --git a/openQA.spec b/openQA.spec index a97bf4b..dc07b42 100644 --- a/openQA.spec +++ b/openQA.spec @@ -33,11 +33,21 @@ %else %bcond_with tests %endif +# SLE < 15 does not provide many of the dependencies for the python sub-package +%if 0%{?sle_version} < 150000 && !0%{?is_opensuse} +%bcond_with python_scripts +%else +%bcond_without python_scripts +%endif # runtime requirements that also the testsuite needs +%if %{with python_scripts} %define python_scripts_requires python3-base python3-requests python3-future +%else +%define python_scripts_requires %{nil} +%endif %define t_requires perl(DBD::Pg) perl(DBIx::Class) perl(Config::IniFiles) perl(SQL::Translator) perl(Date::Format) perl(File::Copy::Recursive) perl(DateTime::Format::Pg) perl(Net::OpenID::Consumer) perl(Mojolicious::Plugin::RenderFile) perl(Mojolicious::Plugin::AssetPack) perl(aliased) perl(Config::Tiny) perl(DBIx::Class::DeploymentHandler) perl(DBIx::Class::DynamicDefault) perl(DBIx::Class::Schema::Config) perl(DBIx::Class::Storage::Statistics) perl(IO::Socket::SSL) perl(Data::Dump) perl(DBIx::Class::OptimisticLocking) perl(Module::Pluggable) perl(Text::Diff) perl(Text::Markdown) perl(JSON::Validator) perl(YAML::XS) perl(IPC::Run) perl(Archive::Extract) perl(CSS::Minifier::XS) perl(JavaScript::Minifier::XS) perl(Time::ParseDate) perl(Sort::Versions) perl(Mojo::RabbitMQ::Client) perl(BSD::Resource) perl(Cpanel::JSON::XS) perl(Pod::POM) perl(Mojo::IOLoop::ReadWriteProcess) perl(Minion) perl(Mojo::Pg) perl(Mojo::SQLite) perl(Minion::Backend::SQLite) %python_scripts_requires Name: openQA -Version: 4.6.1563452417.5a40564d +Version: 4.6.1563545889.6a8f9a53 Release: 0 Summary: The openQA web-frontend, scheduler and tools License: GPL-2.0-or-later @@ -181,6 +191,7 @@ Recommends: jq Tools and support files for openQA client script. Client script is a convenient helper for interacting with openQA webui REST API. +%if %{with python_scripts} %package python-scripts Summary: Additional scripts in python Group: Development/Tools/Other @@ -188,6 +199,7 @@ Requires: %python_scripts_requires %description python-scripts Additional scripts for the use of openQA in the python programming language. +%endif %package local-db Summary: Helper package to ease setup of postgresql DB @@ -241,6 +253,9 @@ rm -rf %{buildroot}/DB %endif %install +%if !%{with python_scripts} +rm script/openqa-label-all +%endif export LC_ALL=en_US.UTF-8 export LANG=en_US.UTF-8 %make_install @@ -254,7 +269,9 @@ ln -s %{_datadir}/openqa/script/openqa-clone-job %{buildroot}%{_bindir}/openqa-c ln -s %{_datadir}/openqa/script/dump_templates %{buildroot}%{_bindir}/openqa-dump-templates ln -s %{_datadir}/openqa/script/load_templates %{buildroot}%{_bindir}/openqa-load-templates ln -s %{_datadir}/openqa/script/openqa-clone-custom-git-refspec %{buildroot}%{_bindir}/openqa-clone-custom-git-refspec +%if %{with python_scripts} ln -s %{_datadir}/openqa/script/openqa-label-all %{buildroot}%{_bindir}/openqa-label-all +%endif cd %{buildroot} grep -rl %{_bindir}/env . | while read file; do @@ -489,9 +506,11 @@ fi %{_bindir}/openqa-load-templates %{_bindir}/openqa-clone-custom-git-refspec +%if %{with python_scripts} %files python-scripts %{_datadir}/openqa/script/openqa-label-all %{_bindir}/openqa-label-all +%endif %files doc %doc docs/*