From 190205b02d971a39d355b91eb52787ac6615a02d Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Jan 03 2020 18:06:09 +0000 Subject: Update to latest git again, resync with upstream Signed-off-by: Adam Williamson --- diff --git a/.gitignore b/.gitignore index ac03ed8..e5424a0 100644 --- a/.gitignore +++ b/.gitignore @@ -80,3 +80,5 @@ /assetcache-09e70da2f8d22b252a8e4f901dda8c8e185e1e75.tar.xz /openQA-8fcf81ff8b3d0276c41ff698a9dd6ed443a710e4.tar.gz /assetcache-8fcf81ff8b3d0276c41ff698a9dd6ed443a710e4.tar.xz +/openQA-68ae00aa4e2b95e07daab8d718f4dd7f974f0766.tar.gz +/assetcache-68ae00aa4e2b95e07daab8d718f4dd7f974f0766.tar.xz diff --git a/FedoraMessaging.pm b/FedoraMessaging.pm index 2b776f0..30cd87c 100644 --- a/FedoraMessaging.pm +++ b/FedoraMessaging.pm @@ -97,7 +97,7 @@ sub log_event_fedora_ci_messages { # USER_CANCELLED *without* an openqa_job_cancel event happening, # so we can't just throw away all openqa_job_done USER_CANCELLED # events... - $stdevent = (grep { $job->result eq $_ } INCOMPLETE_RESULTS) ? 'error' : 'complete'; + $stdevent = (grep { $job->result eq $_ } COMPLETE_RESULTS) ? 'complete' : 'error'; } else { return undef; diff --git a/openqa.spec b/openqa.spec index 9c2cf83..d026138 100644 --- a/openqa.spec +++ b/openqa.spec @@ -23,13 +23,13 @@ %global github_owner os-autoinst %global github_name openQA %global github_version 4.6 -%global github_commit 8fcf81ff8b3d0276c41ff698a9dd6ed443a710e4 +%global github_commit 68ae00aa4e2b95e07daab8d718f4dd7f974f0766 # if set, will be a post-release snapshot build, otherwise a 'normal' build -%global github_date 20191121 +%global github_date 20200101 %global shortcommit %(c=%{github_commit}; echo ${c:0:7}) # can't use linebreaks here! -%global openqa_services openqa-webui.service openqa-gru.service openqa-websockets.service openqa-scheduler.service openqa-livehandler.service openqa-enqueue-audit-event-cleanup.service openqa-enqueue-audit-event-cleanup.timer +%global openqa_services openqa-webui.service openqa-gru.service openqa-websockets.service openqa-scheduler.service openqa-livehandler.service openqa-enqueue-audit-event-cleanup.service openqa-enqueue-audit-event-cleanup.timer openqa-enqueue-asset-and-result-cleanup.service openqa-enqueue-asset-and-result-cleanup.timer %global 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} @@ -40,12 +40,12 @@ %define python_scripts_requires python3-requests python3-future %define assetpack_requires perl(Mojolicious::Plugin::AssetPack) >= 2.01, perl(CSS::Minifier::XS) perl(JavaScript::Minifier::XS) -%define common_requires perl(Config::IniFiles) perl(Cpanel::JSON::XS) perl(Cwd) perl(Data::Dump) perl(Data::Dumper) perl(Digest::MD5) perl(Getopt::Long) perl(Minion) >= 9.09, perl(Mojolicious) >= 7.92, perl(Try::Tiny) perl(Regexp::Common), perl(Storable) +%define common_requires perl(Config::IniFiles) perl(Cpanel::JSON::XS) perl(Cwd) perl(Data::Dump) perl(Data::Dumper) perl(Digest::MD5) perl(Getopt::Long) perl(Minion) >= 9.09, perl(Mojolicious) >= 8.24, perl(Try::Tiny) perl(Regexp::Common), perl(Storable) # runtime requirements for the main package that are not required by other sub-packages # diff from suse: we need perl(Time::Seconds) and perl(Time::Piece) # here, do not lose them when copying from suse %define main_requires %assetpack_requires git-core perl(Carp::Always) perl(Date::Format) perl(DateTime::Format::Pg) perl(DBD::Pg) >= 3.7.4, perl(DBI) >= 1.632, perl(DBIx::Class) >= 0.082801, perl(DBIx::Class::DeploymentHandler) perl(DBIx::Class::DynamicDefault) perl(DBIx::Class::Schema::Config) perl(DBIx::Class::Storage::Statistics) perl(DBIx::Class::OptimisticLocking) perl(File::Copy::Recursive) perl(Net::OpenID::Consumer) perl(Module::Pluggable) perl(aliased) perl(Config::Tiny) perl(Text::Diff) perl(CommonMark) perl(JSON::Validator) perl(IPC::Run) perl(Archive::Extract) perl(Time::ParseDate) perl(Sort::Versions) perl(BSD::Resource) perl(Pod::POM) perl(Mojo::Pg) perl(Mojo::RabbitMQ::Client) >= 0.2, perl(SQL::Translator) perl(YAML::XS) >= 0.67, perl(LWP::UserAgent) perl(Time::Seconds) perl(Time::Piece) -%define client_requires git-core perl(IO::Socket::SSL) >= 2.009, perl(LWP::UserAgent) perl(IPC::Run) +%define client_requires curl jq git-core perl(IO::Socket::SSL) >= 2.009, perl(LWP::UserAgent) perl(IPC::Run) %define worker_requires os-autoinst < 5, perl(Mojo::IOLoop::ReadWriteProcess) > 0.19, perl(Minion::Backend::SQLite) perl(Mojo::SQLite) openqa-client optipng %define build_requires rubygem(sass) %assetpack_requires @@ -55,17 +55,18 @@ # Diff from SUSE: Selenium requirements dropped as not available in Fedora, # perl(Perl::Critic::Freenode) dropped as not available in Fedora (and # doesn't seem to hurt if it's missing) -%define test_requires %common_requires %main_requires %python_scripts_requires %worker_requires perl(App::cpanminus) perl(Module::Load::Conditional) perl(Perl::Critic) perl(Test::Mojo) perl(Test::More) perl(Test::Strict) perl(Test::Fatal) perl(Test::MockModule) perl(Test::MockObject) perl(Test::Output) perl(Test::Pod) perl(Test::Warnings) perl(Test::Exception) ShellCheck os-autoinst-devel postgresql-server +%define test_requires %common_requires %main_requires %python_scripts_requires %worker_requires perl(App::cpanminus) perl(Module::Load::Conditional) perl(Perl::Critic) perl(Test::Mojo) perl(Test::More) perl(Test::Strict) perl(Test::Fatal) perl(Test::MockModule) perl(Test::MockObject) perl(Test::Output) perl(Test::Pod) perl(Test::Warnings) perl(Test::Exception) ShellCheck os-autoinst-devel postgresql-server curl jq # diff from SUSE: perl(Devel::Cover::Report::Codecov) dropped because # it's not in Fedora (this means you can't run 'make coverage-codecov') # xorg-x11-fonts dropped because that binary package doesn't exist in # Fedora (it exists as a source package generating multiple binary # packages) and I can't find any particular reason for it +# chromedriver dropped as we don't package it %define devel_requires %build_requires %test_requires rsync curl postgresql-devel qemu qemu-kvm tar sudo perl(Devel::Cover) perl(Perl::Tidy) Name: openqa Version: %{github_version} -Release: 38%{?github_date:.%{github_date}git%{shortcommit}}%{?dist} +Release: 39%{?github_date:.%{github_date}git%{shortcommit}}%{?dist} Summary: OS-level automated testing framework License: GPLv2+ Url: http://os-autoinst.github.io/openQA/ @@ -95,7 +96,7 @@ BuildRequires: systemd BuildRequires: glibc-langpack-en BuildRequires: %{build_requires} BuildRequires: %{test_requires} -Requires: perl(Minion) >= 9.13 +Requires: perl(Minion) >= 10.0 Requires: %{main_requires} Requires: openqa-common = %{version}-%{release} Requires: openqa-client = %{version}-%{release} @@ -142,7 +143,6 @@ Development package pulling in all build+test dependencies. %package common Summary: Common components for openQA server and workers Requires: %{common_requires} -Requires: perl(Mojolicious) >= 7.92 # critical bug fix Requires: perl(DBIx::Class) >= 0.082801 # assetpack has to approximately match version srpm was built with @@ -228,7 +228,6 @@ update (network issue, quasi-random bug in underlying package, etc.) Summary: Client tools for remote openQA management Requires: openqa-common = %{version} Requires: %client_requires -Recommends: jq %description client This package contains the openQA client script, along with several @@ -331,6 +330,8 @@ export LC_ALL=en_US.UTF-8 # if they exist. upstream repo does this in .travis.yml. touch openqa-debug.log autoinst-log.txt chmod a+w openqa-debug.log autoinst-log.txt +# we can't use 'unshare' in Fedora package build env +sed -i -e 's,unshare -r -n ,,g' t/40-script_openqa-clone-custom-git-refspec.t # Skip tests not working currently, or flaky rm t/25-cache-service.t @@ -408,6 +409,8 @@ fi %{_unitdir}/openqa-websockets.service %{_unitdir}/openqa-enqueue-audit-event-cleanup.service %{_unitdir}/openqa-enqueue-audit-event-cleanup.timer +%{_unitdir}/openqa-enqueue-asset-and-result-cleanup.service +%{_unitdir}/openqa-enqueue-asset-and-result-cleanup.timer # web libs %{_datadir}/openqa/templates %{_datadir}/openqa/public @@ -534,6 +537,11 @@ fi %{_datadir}/openqa/lib/OpenQA/WebAPI/Plugin/FedoraUpdateRestart.pm %changelog +* Thu Jan 02 2020 Adam Williamson - 4.6-39.20200101git68ae00a +- Bump to latest git again +- Resync with upstream spec +- Update FedoraMessaging plugin for changes to constants + * Fri Nov 22 2019 Adam Williamson - 4.6-38.20191121git8fcf81f - Drop a couple of unsatisfiable deps from the -devel package diff --git a/sources b/sources index f8ada50..5d70e02 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (openQA-8fcf81ff8b3d0276c41ff698a9dd6ed443a710e4.tar.gz) = 5fc96c3f39e641624f462f031966f01fa011247066ed01e8a2f819918bb92285276bc1d43332af4a4349a857b11a6de3c37d352afdb4ff720ef3a8b429fd7d1d -SHA512 (assetcache-8fcf81ff8b3d0276c41ff698a9dd6ed443a710e4.tar.xz) = f4d04d8ed6b2e379f921511d17dee3e8a8814c5d6446d45068eb1e0c4f919ebe25e82a27649a730ab6157fdada1248d6392ffda6e4845f0e88a5888a3fa6b31e +SHA512 (openQA-68ae00aa4e2b95e07daab8d718f4dd7f974f0766.tar.gz) = a7eb1d2a47e33d4b89ea8776ae2ee12c6c0e1abdf35cb1f747db62f17176792097615e331000128dd67a85173f3942e6a370732c4a87eecb5e2f2b1a9bf32c5a +SHA512 (assetcache-68ae00aa4e2b95e07daab8d718f4dd7f974f0766.tar.xz) = 2098653009e82c184ab5679c613670e9f24f34f7db1b722a6a19e3c6747fa969af5b650ca61bf5edb7bfb7912fb477ab5de79c32c5ee2db44571dbb13cf7c802