From 1b4b2d335f306013012f89475219008e82624c9bb018148e1b051c86d66ac5ab Mon Sep 17 00:00:00 2001 From: Oliver Kurz Date: Fri, 1 Mar 2019 05:22:47 +0000 Subject: [PATCH 1/2] Offline generation of 4.6.1551367982.a3362096 4.6.1551367982.a3362096 OBS-URL: https://build.opensuse.org/package/show/devel:openQA:tested/openQA?expand=0&rev=181 --- Dockerfile | 2 ++ openQA-4.6.1551101052.7f891940.obscpio | 3 --- openQA-4.6.1551367982.a3362096.obscpio | 3 +++ openQA-test.changes | 21 +++++++++++++++++++++ openQA-test.spec | 2 +- openQA.changes | 21 +++++++++++++++++++++ openQA.obsinfo | 6 +++--- openQA.spec | 4 ++-- 8 files changed, 53 insertions(+), 9 deletions(-) delete mode 100644 openQA-4.6.1551101052.7f891940.obscpio create mode 100644 openQA-4.6.1551367982.a3362096.obscpio diff --git a/Dockerfile b/Dockerfile index d1ad91c..32fbbfb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -90,6 +90,8 @@ RUN zypper in -y -C \ 'perl(Mojolicious)' \ 'perl(Mojolicious::Plugin::AssetPack)' \ 'perl(Mojolicious::Plugin::RenderFile)' \ + 'perl(JSON::Validator)' \ + 'perl(YAML::XS)' \ 'perl(Net::DBus)' \ 'perl(Net::OpenID::Consumer)' \ 'perl(Net::SNMP)' \ diff --git a/openQA-4.6.1551101052.7f891940.obscpio b/openQA-4.6.1551101052.7f891940.obscpio deleted file mode 100644 index cc9e2db..0000000 --- a/openQA-4.6.1551101052.7f891940.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:61236063c2fdce1893925fae6e4c32f5c54e3c208b61fad7bb5bb611a6f23230 -size 8886797 diff --git a/openQA-4.6.1551367982.a3362096.obscpio b/openQA-4.6.1551367982.a3362096.obscpio new file mode 100644 index 0000000..0097d69 --- /dev/null +++ b/openQA-4.6.1551367982.a3362096.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d2836db3b72b8088005a50b1d92d97c8518dfdd45b232bb23e5ee7c554c0593f +size 8888845 diff --git a/openQA-test.changes b/openQA-test.changes index d8d3511..3584bfb 100644 --- a/openQA-test.changes +++ b/openQA-test.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Fri Mar 01 05:22:31 UTC 2019 - coolo@suse.com + +- Update to version 4.6.1551367982.a3362096: + * Allow test vars for openqa-clone-custom-git-refs… + * Fix updating needle Git repository + * Fix uniform box widths of dependency graph in current Firefox + * Move JSON::Validator and YAML::XS to t_requires + * Drop the `cpanfile` changes + * Add YAML::XS and JSON::Validator dependencies + * worker: Skip announcing stop if isotovideo already exited + * worker: Fix "final status update" + * worker: Refactor _stop_job_kill_and_upload + * worker: Remove extra handling for dead children + * worker: Make API calls when stopping job non-critical + * worker: Treat upload failures as API failures + * Raise an exception if deploying the SQLite database fails and handle an existing database more gracefully + * Do not reset the job queue every time the cache service is restarted + * Test cache service migrations + * Use Mojo::SQLite migrations to handle schema upgrades in the cache service gracefully + ------------------------------------------------------------------- Tue Feb 26 21:22:42 UTC 2019 - coolo@suse.com diff --git a/openQA-test.spec b/openQA-test.spec index 50006da..97ca320 100644 --- a/openQA-test.spec +++ b/openQA-test.spec @@ -18,7 +18,7 @@ %define short_name openQA Name: %{short_name}-test -Version: 4.6.1551101052.7f891940 +Version: 4.6.1551367982.a3362096 Release: 0 Summary: Test package for openQA License: GPL-2.0-or-later diff --git a/openQA.changes b/openQA.changes index 42bb522..20d104e 100644 --- a/openQA.changes +++ b/openQA.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Fri Mar 01 05:22:31 UTC 2019 - coolo@suse.com + +- Update to version 4.6.1551367982.a3362096: + * Allow test vars for openqa-clone-custom-git-refs… + * Fix updating needle Git repository + * Fix uniform box widths of dependency graph in current Firefox + * Move JSON::Validator and YAML::XS to t_requires + * Drop the `cpanfile` changes + * Add YAML::XS and JSON::Validator dependencies + * worker: Skip announcing stop if isotovideo already exited + * worker: Fix "final status update" + * worker: Refactor _stop_job_kill_and_upload + * worker: Remove extra handling for dead children + * worker: Make API calls when stopping job non-critical + * worker: Treat upload failures as API failures + * Raise an exception if deploying the SQLite database fails and handle an existing database more gracefully + * Do not reset the job queue every time the cache service is restarted + * Test cache service migrations + * Use Mojo::SQLite migrations to handle schema upgrades in the cache service gracefully + ------------------------------------------------------------------- Tue Feb 26 21:22:42 UTC 2019 - coolo@suse.com diff --git a/openQA.obsinfo b/openQA.obsinfo index 9650428..7e6898c 100644 --- a/openQA.obsinfo +++ b/openQA.obsinfo @@ -1,5 +1,5 @@ name: openQA -version: 4.6.1551101052.7f891940 -mtime: 1551101052 -commit: 7f89194007becda7b28bc8c69cab4e1230737390 +version: 4.6.1551367982.a3362096 +mtime: 1551367982 +commit: a3362096df4ccb1949d4a74b500612f8242329e1 diff --git a/openQA.spec b/openQA.spec index a4a5854..c2255da 100644 --- a/openQA.spec +++ b/openQA.spec @@ -34,9 +34,9 @@ %bcond_with tests %endif # runtime requirements that also the testsuite needs -%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::DynamicDefault) perl(DBIx::Class::Schema::Config) perl(DBIx::Class::Storage::Statistics) perl(IO::Socket::SSL) perl(Data::Dump) perl(DBIx::Class::OptimisticLocking) perl(Text::Markdown) perl(Net::DBus) 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) +%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::DynamicDefault) perl(DBIx::Class::Schema::Config) perl(DBIx::Class::Storage::Statistics) perl(IO::Socket::SSL) perl(Data::Dump) perl(DBIx::Class::OptimisticLocking) perl(Text::Markdown) perl(Net::DBus) 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) Name: openQA -Version: 4.6.1551101052.7f891940 +Version: 4.6.1551367982.a3362096 Release: 0 Summary: The openQA web-frontend, scheduler and tools License: GPL-2.0-or-later From 43eb15f195d345a44ff1804aaf406c781b9ea4e4def44635b7406a98616bfb64 Mon Sep 17 00:00:00 2001 From: Oliver Kurz Date: Sun, 3 Mar 2019 13:22:10 +0000 Subject: [PATCH 2/2] Offline generation of 4.6.1551454083.e27d66d8 4.6.1551454083.e27d66d8 OBS-URL: https://build.opensuse.org/package/show/devel:openQA:tested/openQA?expand=0&rev=182 --- openQA-4.6.1551367982.a3362096.obscpio | 3 --- openQA-4.6.1551454083.e27d66d8.obscpio | 3 +++ openQA-test.changes | 13 +++++++++++-- openQA-test.spec | 2 +- openQA.changes | 13 +++++++++++-- openQA.obsinfo | 6 +++--- openQA.spec | 9 +++------ 7 files changed, 32 insertions(+), 17 deletions(-) delete mode 100644 openQA-4.6.1551367982.a3362096.obscpio create mode 100644 openQA-4.6.1551454083.e27d66d8.obscpio diff --git a/openQA-4.6.1551367982.a3362096.obscpio b/openQA-4.6.1551367982.a3362096.obscpio deleted file mode 100644 index 0097d69..0000000 --- a/openQA-4.6.1551367982.a3362096.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d2836db3b72b8088005a50b1d92d97c8518dfdd45b232bb23e5ee7c554c0593f -size 8888845 diff --git a/openQA-4.6.1551454083.e27d66d8.obscpio b/openQA-4.6.1551454083.e27d66d8.obscpio new file mode 100644 index 0000000..962ed53 --- /dev/null +++ b/openQA-4.6.1551454083.e27d66d8.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cea41c1d104df408e1fe249b543fdad02efbfdcb102e0e8487ba83b06047360a +size 8877581 diff --git a/openQA-test.changes b/openQA-test.changes index 3584bfb..a1963de 100644 --- a/openQA-test.changes +++ b/openQA-test.changes @@ -1,7 +1,9 @@ ------------------------------------------------------------------- -Fri Mar 01 05:22:31 UTC 2019 - coolo@suse.com +Sat Mar 02 17:37:11 UTC 2019 - coolo@suse.com -- Update to version 4.6.1551367982.a3362096: +- Update to version 4.6.1551454083.e27d66d8: + * Extend apparmor profile for all Git commands we use + * Correct limit_assets task arguments * Allow test vars for openqa-clone-custom-git-refs… * Fix updating needle Git repository * Fix uniform box widths of dependency graph in current Firefox @@ -18,6 +20,13 @@ Fri Mar 01 05:22:31 UTC 2019 - coolo@suse.com * Do not reset the job queue every time the cache service is restarted * Test cache service migrations * Use Mojo::SQLite migrations to handle schema upgrades in the cache service gracefully + * Remove unused imports and IPC objects + * Remove the resource allocator + * Move barrier handling out of the resource allocator + * Move mutex handling out of the resource allocator + * Remove first dbus method and use OpenQA::Schema directly + * Declare the DBIx::Class dependency properly + * Move OpenQA::Resource::Jobs handling from the resource allocator to the webapi ------------------------------------------------------------------- Tue Feb 26 21:22:42 UTC 2019 - coolo@suse.com diff --git a/openQA-test.spec b/openQA-test.spec index 97ca320..ce17cb7 100644 --- a/openQA-test.spec +++ b/openQA-test.spec @@ -18,7 +18,7 @@ %define short_name openQA Name: %{short_name}-test -Version: 4.6.1551367982.a3362096 +Version: 4.6.1551454083.e27d66d8 Release: 0 Summary: Test package for openQA License: GPL-2.0-or-later diff --git a/openQA.changes b/openQA.changes index 20d104e..d462f23 100644 --- a/openQA.changes +++ b/openQA.changes @@ -1,7 +1,9 @@ ------------------------------------------------------------------- -Fri Mar 01 05:22:31 UTC 2019 - coolo@suse.com +Sat Mar 02 17:37:11 UTC 2019 - coolo@suse.com -- Update to version 4.6.1551367982.a3362096: +- Update to version 4.6.1551454083.e27d66d8: + * Extend apparmor profile for all Git commands we use + * Correct limit_assets task arguments * Allow test vars for openqa-clone-custom-git-refs… * Fix updating needle Git repository * Fix uniform box widths of dependency graph in current Firefox @@ -18,6 +20,13 @@ Fri Mar 01 05:22:31 UTC 2019 - coolo@suse.com * Do not reset the job queue every time the cache service is restarted * Test cache service migrations * Use Mojo::SQLite migrations to handle schema upgrades in the cache service gracefully + * Remove unused imports and IPC objects + * Remove the resource allocator + * Move barrier handling out of the resource allocator + * Move mutex handling out of the resource allocator + * Remove first dbus method and use OpenQA::Schema directly + * Declare the DBIx::Class dependency properly + * Move OpenQA::Resource::Jobs handling from the resource allocator to the webapi ------------------------------------------------------------------- Tue Feb 26 21:22:42 UTC 2019 - coolo@suse.com diff --git a/openQA.obsinfo b/openQA.obsinfo index 7e6898c..a1d6fae 100644 --- a/openQA.obsinfo +++ b/openQA.obsinfo @@ -1,5 +1,5 @@ name: openQA -version: 4.6.1551367982.a3362096 -mtime: 1551367982 -commit: a3362096df4ccb1949d4a74b500612f8242329e1 +version: 4.6.1551454083.e27d66d8 +mtime: 1551454083 +commit: e27d66d8146d654bcd2d50bad10692b33d82d53e diff --git a/openQA.spec b/openQA.spec index c2255da..5294b0e 100644 --- a/openQA.spec +++ b/openQA.spec @@ -17,7 +17,7 @@ # can't use linebreaks here! -%define openqa_services openqa-webui.service openqa-gru.service openqa-websockets.service openqa-scheduler.service openqa-resource-allocator.service +%define openqa_services openqa-webui.service openqa-gru.service openqa-websockets.service openqa-scheduler.service %define openqa_worker_services openqa-worker.target openqa-slirpvde.service openqa-vde_switch.service openqa-worker-cacheservice.service openqa-worker-cacheservice-minion.service %if %{undefined tmpfiles_create} %define tmpfiles_create() \ @@ -36,7 +36,7 @@ # runtime requirements that also the testsuite needs %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::DynamicDefault) perl(DBIx::Class::Schema::Config) perl(DBIx::Class::Storage::Statistics) perl(IO::Socket::SSL) perl(Data::Dump) perl(DBIx::Class::OptimisticLocking) perl(Text::Markdown) perl(Net::DBus) 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) Name: openQA -Version: 4.6.1551367982.a3362096 +Version: 4.6.1551454083.e27d66d8 Release: 0 Summary: The openQA web-frontend, scheduler and tools License: GPL-2.0-or-later @@ -255,7 +255,7 @@ grep -rl %{_bindir}/env . | while read file; do sed -e 's,%{_bindir}/env perl,%{_bindir}/perl,' -i $file done mkdir -p %{buildroot}%{_sbindir} -for i in webui gru worker resource-allocator scheduler websockets slirpvde vde_switch livehandler; do +for i in webui gru worker scheduler websockets slirpvde vde_switch livehandler; do ln -s ../sbin/service %{buildroot}%{_sbindir}/rcopenqa-$i done # @@ -356,7 +356,6 @@ fi %doc README.asciidoc %{_sbindir}/rcopenqa-gru %{_sbindir}/rcopenqa-scheduler -%{_sbindir}/rcopenqa-resource-allocator %{_sbindir}/rcopenqa-websockets %{_sbindir}/rcopenqa-webui %{_sbindir}/rcopenqa-livehandler @@ -385,7 +384,6 @@ fi %{_unitdir}/openqa-livehandler.service %{_unitdir}/openqa-gru.service %{_unitdir}/openqa-scheduler.service -%{_unitdir}/openqa-resource-allocator.service %{_unitdir}/openqa-websockets.service # web libs %dir %{_datadir}/openqa @@ -400,7 +398,6 @@ fi %{_datadir}/openqa/script/initdb %{_datadir}/openqa/script/openqa %{_datadir}/openqa/script/openqa-scheduler -%{_datadir}/openqa/script/openqa-resource-allocator %{_datadir}/openqa/script/openqa-websockets %{_datadir}/openqa/script/openqa-livehandler %{_datadir}/openqa/script/upgradedb