diff --git a/.gitignore b/.gitignore index 684c84a..d19aacb 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,5 @@ /assetcache-fead7af87dcb066b88107eef4b0192a76f5814fa.tar.xz /openQA-4c72a17b2cb02d530e5926147e57a01db04ddd95.tar.gz /assetcache-4c72a17b2cb02d530e5926147e57a01db04ddd95.tar.xz +/openQA-9fa63536b04a947f23c3b9e5dbe3bcaddd40093a.tar.gz +/assetcache-9fa63536b04a947f23c3b9e5dbe3bcaddd40093a.tar.xz diff --git a/FedoraUpdateRestart.pm b/FedoraUpdateRestart.pm index d2ba4b8..07bc885 100644 --- a/FedoraUpdateRestart.pm +++ b/FedoraUpdateRestart.pm @@ -21,7 +21,6 @@ use warnings; use parent 'Mojolicious::Plugin'; use Mojo::IOLoop; use OpenQA::Schema::Result::Jobs; -use OpenQA::Utils qw(notify_workers); sub register { my ($self, $app) = @_; @@ -39,7 +38,6 @@ sub on_job_done { my $clone_of = $app->db->resultset("Jobs")->find({clone_id => $job->id}); if ($job->result eq OpenQA::Schema::Result::Jobs::FAILED && !$clone_of && $job->FLAVOR =~ /^updates-/) { $job->auto_duplicate; - notify_workers; } } diff --git a/openqa.spec b/openqa.spec index 9acc080..9fc5d73 100644 --- a/openqa.spec +++ b/openqa.spec @@ -23,9 +23,9 @@ %global github_owner os-autoinst %global github_name openQA %global github_version 4.4 -%global github_commit 4c72a17b2cb02d530e5926147e57a01db04ddd95 +%global github_commit 9fa63536b04a947f23c3b9e5dbe3bcaddd40093a # if set, will be a post-release snapshot build, otherwise a 'normal' build -%global github_date 20170730 +%global github_date 20170817 %global shortcommit %(c=%{github_commit}; echo ${c:0:7}) # can't use linebreaks here! @@ -40,7 +40,7 @@ systemd-tmpfiles --create %{?*} >/dev/null 2>&1 || : Name: openqa Version: %{github_version} -Release: 53%{?github_date:.%{github_date}git%{shortcommit}}%{?dist} +Release: 59%{?github_date:.%{github_date}git%{shortcommit}}%{?dist} Summary: OS-level automated testing framework License: GPLv2+ Url: http://os-autoinst.github.io/openQA/ @@ -59,10 +59,6 @@ Source2: FedoraUpdateRestart.pm # at least. It also insulates us from general wackiness... Patch0: 0001-Duplicate-jobs-on-died-as-well-as-quit.patch -# Avoid workers stalling when job grabbing goes wonky -# https://github.com/os-autoinst/openQA/pull/1410 -Patch1: 1410.patch - # For the httpd subpackage split in 4.3-7, needed for updates to work right Obsoletes: openqa < 4.3-7 @@ -458,6 +454,26 @@ fi %{_datadir}/openqa/lib/OpenQA/WebAPI/Plugin/FedoraUpdateRestart.pm %changelog +* Thu Aug 17 2017 Adam Williamson - 4.4-59.20170817git9fa6353 +- Bump to latest git +- Drop #1432 patch (now merged) + +* Tue Aug 15 2017 Adam Williamson - 4.4-58.20170810git5b1e729 +- Backport PR #1432 to hopefully improve remaining scheduler problems + +* Thu Aug 10 2017 Adam Williamson - 4.4-57.20170810git5b1e729 +- Bump to latest git again (more scheduler fixes) + +* Fri Aug 04 2017 Adam Williamson - 4.4-56.20170804gitb5911e5 +- Bump to latest git again (some tweaks to scheduling) +- Patch a new test to include . in INC + +* Wed Aug 02 2017 Adam Williamson - 4.4-55.20170802git25c355a +- Drop notify_workers from update restart plugin + +* Wed Aug 02 2017 Adam Williamson - 4.4-54.20170802git25c355a +- Bump to latest git again (with removal of job grabbing) + * Mon Jul 31 2017 Adam Williamson - 4.4-53.20170730git4c72a17 - Patch an issue in job grabbing that could cause workers to stall diff --git a/sources b/sources index e3a4cb1..10b1e58 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (openQA-4c72a17b2cb02d530e5926147e57a01db04ddd95.tar.gz) = bf2700a0d7a13b9a8ca75dec2b1608c8ad8050ce4c70608b7a568673080076c84534597fb90aca5f72eeb79e2208eb4b874895480e5e31ba9f8d9002de6dde1b -SHA512 (assetcache-4c72a17b2cb02d530e5926147e57a01db04ddd95.tar.xz) = e27fb349dbdb5368917c5aaf3505b58558fd57cda1d9d9f91e0cd96606933c1c436ef965c8972e8c5332beaaf3fc1ccccf43f76f9fde4014ef4452889874b02e +SHA512 (openQA-9fa63536b04a947f23c3b9e5dbe3bcaddd40093a.tar.gz) = 0f8875db297bb4e56b7a81fe2a3ccfe37ae570235bba1f862bf3a179495b156e1b7cb39858790bdb8ba52c776bcec285eb02a14ce0740e79013739ecb4c8ae51 +SHA512 (assetcache-9fa63536b04a947f23c3b9e5dbe3bcaddd40093a.tar.xz) = 1cec6e896d8bfa7a5a1e0d8e00b2e51c0afd7e0d2eead89ffce0158c29996ac82d1c53b77ab9307aa7b72cd055837a539a3a067b4ecd27dfed3177c74038abf8