diff --git a/.gitignore b/.gitignore index 29b60d7..1d69389 100644 --- a/.gitignore +++ b/.gitignore @@ -92,3 +92,5 @@ /assetcache-46234f90c3852646b7f80b88dcb9d8e5dca07f10.tar.xz /openQA-5349e27e9036e6c6a53218a84f451a7999aa00fd.tar.gz /assetcache-5349e27e9036e6c6a53218a84f451a7999aa00fd.tar.xz +/openQA-e9b44740c89522368b2561bf94a34d86d11eb62d.tar.gz +/assetcache-e9b44740c89522368b2561bf94a34d86d11eb62d.tar.xz diff --git a/openqa.spec b/openqa.spec index 859b60e..a255c6b 100644 --- a/openqa.spec +++ b/openqa.spec @@ -23,9 +23,9 @@ %global github_owner os-autoinst %global github_name openQA %global github_version 4.6 -%global github_commit 5349e27e9036e6c6a53218a84f451a7999aa00fd +%global github_commit e9b44740c89522368b2561bf94a34d86d11eb62d # if set, will be a post-release snapshot build, otherwise a 'normal' build -%global github_date 20200607 +%global github_date 20200805 %global shortcommit %(c=%{github_commit}; echo ${c:0:7}) # can't use linebreaks here! @@ -43,7 +43,7 @@ # The following line is generated from dependencies.yaml (upstream) %define assetpack_requires perl(CSS::Minifier::XS) >= 0.01 perl(JavaScript::Minifier::XS) >= 0.11 perl(Mojolicious::Plugin::AssetPack) >= 1.36 # The following line is generated from dependencies.yaml (upstream) -%define common_requires perl(Archive::Extract) > 0.7 perl(Config::IniFiles) perl(Cpanel::JSON::XS) perl(Cwd) perl(Data::Dump) perl(Data::Dumper) perl(Digest::MD5) perl(Getopt::Long) perl(Minion) >= 10.04 perl(Mojolicious) >= 8.42 perl(Regexp::Common) perl(Storable) perl(Try::Tiny) +%define common_requires perl(Archive::Extract) > 0.7 perl(Config::IniFiles) perl(Cpanel::JSON::XS) perl(Cwd) perl(Data::Dump) perl(Data::Dumper) perl(Digest::MD5) perl(Getopt::Long) perl(Minion) >= 10.08 perl(Mojolicious) >= 8.55 perl(Regexp::Common) perl(Storable) perl(Try::Tiny) # runtime requirements for the main package that are not required by other sub-packages # The following line is generated from dependencies.yaml (upstream) %define main_requires %assetpack_requires git-core perl(BSD::Resource) perl(Carp) perl(Carp::Always) perl(CommonMark) perl(Config::Tiny) 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::OptimisticLocking) perl(DBIx::Class::ResultClass::HashRefInflator) perl(DBIx::Class::Schema::Config) perl(DBIx::Class::Storage::Statistics) perl(Date::Format) perl(DateTime) perl(DateTime::Duration) perl(DateTime::Format::Pg) perl(Exporter) perl(Fcntl) perl(File::Basename) perl(File::Copy) perl(File::Copy::Recursive) perl(File::Path) perl(File::Spec) perl(FindBin) perl(Getopt::Long::Descriptive) perl(IO::Handle) perl(IPC::Run) perl(JSON::Validator) perl(LWP::UserAgent) perl(Module::Load::Conditional) perl(Module::Pluggable) perl(Mojo::Base) perl(Mojo::ByteStream) perl(Mojo::IOLoop) perl(Mojo::JSON) perl(Mojo::Pg) perl(Mojo::RabbitMQ::Client) >= 0.2 perl(Mojo::URL) perl(Mojo::Util) perl(Mojolicious::Commands) perl(Mojolicious::Plugin) perl(Mojolicious::Static) perl(Net::OpenID::Consumer) perl(POSIX) perl(Pod::POM) perl(SQL::Translator) perl(Scalar::Util) perl(Sort::Versions) perl(Text::Diff) perl(Time::HiRes) perl(Time::ParseDate) perl(Time::Piece) perl(Time::Seconds) perl(URI::Escape) perl(YAML::PP) >= 0.020 perl(YAML::XS) perl(aliased) perl(base) perl(constant) perl(diagnostics) perl(strict) perl(warnings) @@ -51,7 +51,7 @@ %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) # diff from SUSE: case (they have openQA-client, we have openqa-client) # The following line is generated from dependencies.yaml (upstream) -%define worker_requires openqa-client optipng os-autoinst < 5 perl(Minion::Backend::SQLite) perl(Mojo::IOLoop::ReadWriteProcess) >= 0.20 perl(Mojo::SQLite) +%define worker_requires openqa-client optipng os-autoinst < 5 perl(Minion::Backend::SQLite) >= 5.0.1 perl(Mojo::IOLoop::ReadWriteProcess) >= 0.26 perl(Mojo::SQLite) # The following line is generated from dependencies.yaml (upstream) %define build_requires %assetpack_requires rubygem(sass) @@ -59,12 +59,12 @@ # Do not require on this in individual sub-packages except for the devel # package. # Diff from SUSE: Selenium requirements dropped as not available in Fedora, -# critic and (python) yamllint requirements dropped (except Perl::Critic -# itself as the compile-check-all test fails on the in-tree critic module -# if we leave that out) as we don't run those checks in our package build -# (SUSE runs them in theirs) +# critic, (python) yamllint and (python) jsbeautify requirements dropped +# (except Perl::Critic itself as the compile-check-all test fails on the +# in-tree critic module if we leave that out) as we don't run those checks +# in our package build (SUSE runs them in theirs) # The following line is generated from dependencies.yaml (upstream) -%define test_requires %common_requires %main_requires %python_scripts_requires %worker_requires ShellCheck curl jq os-autoinst-devel perl(App::cpanminus) perl(Perl::Critic) perl(Test::Exception) perl(Test::Fatal) perl(Test::MockModule) perl(Test::MockObject) perl(Test::Mojo) perl(Test::Most) perl(Test::Output) perl(Test::Pod) perl(Test::Strict) perl(Test::Warnings) >= 0.029 postgresql-server +%define test_requires %common_requires %main_requires %python_scripts_requires %worker_requires ShellCheck curl jq os-autoinst-devel perl(App::cpanminus) perl(Mojolicious::Plugin::OAuth2) perl(Perl::Critic) perl(Test::Exception) perl(Test::Fatal) perl(Test::MockModule) perl(Test::MockObject) perl(Test::Mojo) perl(Test::Most) perl(Test::Output) perl(Test::Pod) perl(Test::Strict) perl(Test::Warnings) >= 0.029 postgresql-server %ifarch x86_64 %define qemu qemu qemu-kvm %else @@ -75,13 +75,18 @@ # 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 -# The following line is generated from dependencies.yaml +# The following line is generated from dependencies.yaml (upstream) %define devel_requires %build_requires %qemu %test_requires curl perl(Devel::Cover) perl(Perl::Tidy) postgresql-devel rsync sudo tar +%define devel_no_selenium_requires %build_requires %qemu %test_requires curl perl(Devel::Cover) perl(Perl::Tidy) postgresql-devel rsync sudo tar +# diff from SUSE: chromedriver dropped as we don't package it +# that makes this look fairly silly, but we want to follow the SUSE +# spec as close as we can +# The following line is generated from dependencies.yaml (upstream) +%define devel_requires %devel_no_selenium_requires Name: openqa Version: %{github_version} -Release: 52%{?github_date:.%{github_date}git%{shortcommit}}%{?dist} +Release: 53%{?github_date:.%{github_date}git%{shortcommit}}%{?dist} Summary: OS-level automated testing framework License: GPLv2+ Url: http://os-autoinst.github.io/openQA/ @@ -103,6 +108,10 @@ Source3: FedoraMessaging.pm # tests for the fedora-messaging publishing plugin Source4: 23-fedora-messaging.t +# Revert a Makefile change that breaks the tests in Fedora build env: +# https://github.com/os-autoinst/openQA/pull/3194#issuecomment-669524419 +Patch0: 0001-Revert-Use-relative-path-in-test-with-database-targe.patch + BuildRequires: %{python_scripts_requires} BuildRequires: perl-generators # Standard for packages that have systemd services @@ -120,6 +129,8 @@ Requires(post): coreutils # Standard for packages that have systemd services %{?systemd_requires} +# the plugin is needed if the auth method is set to "oauth2" +Recommends: perl(Mojolicious::Plugin::OAuth2) # server needs to run an rsync server if worker caching is used Recommends: rsync @@ -364,11 +375,14 @@ sed -i -e 's,unshare -r -n ,,g' t/40-script_openqa-clone-custom-git-refspec.t t/ sed -i -e '/fails without network/d' t/32-openqa_client-script.t # Skip tests not working currently, or flaky rm t/25-cache-service.t t/17-labels_carry_over.t +# XXX for mock builds, uncomment this: see +# https://github.com/rpm-software-management/mock/issues/612 +#rm t/40-openqa-clone-job.t # GIT_CEILING_DIRECTORIES here avoids a case where git error handling # can differ when you run the build in mock and cause 16-utils-runcmd # to fail -make test-with-database GIT_CEILING_DIRECTORIES="/" OBS_RUN=1 PROVE_ARGS='-l -r' TEST_PG_PATH=%{buildroot}/DB +make test-with-database GIT_CEILING_DIRECTORIES="/" CHECKSTYLE=0 PROVE_ARGS='-l -r' TEST_PG_PATH=%{buildroot}/DB rm -rf %{buildroot}/DB @@ -615,6 +629,9 @@ fi %{_datadir}/openqa/lib/OpenQA/WebAPI/Plugin/FedoraUpdateRestart.pm %changelog +* Wed Aug 05 2020 Adam Williamson - 4.6-53.20200805gite9b4474 +- Bump to latest git, re-sync spec with upstream + * Tue Aug 04 2020 Adam Williamson - 4.6-52.20200607git5349e27 - Bump to more recent git, re-sync spec with upstream diff --git a/sources b/sources index d8f74e9..bce0a66 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (openQA-5349e27e9036e6c6a53218a84f451a7999aa00fd.tar.gz) = 1af7000363ed05335b2517dab83950bf33adbd67614eff4ee151123390c010499410a5592c79fe38159020ef71aa1b0954828929431ee3f90e6e3736006adf31 -SHA512 (assetcache-5349e27e9036e6c6a53218a84f451a7999aa00fd.tar.xz) = f6ba65f6ec3e81e6b082b8cc0f6ba61607414e2d9b17a56e238b4d9306f067300bdb0d41c3790b26d08b79db31fee492444a0c7a25294a5a6a78b9fcadf6e756 +SHA512 (openQA-e9b44740c89522368b2561bf94a34d86d11eb62d.tar.gz) = 687895369329230d360db77090dd793ef111ccf795e375299c20246227fe8e5c9d3cd447c20cd647249316799263672be925499cc1c52ca5b95e3232e2e39ec4 +SHA512 (assetcache-e9b44740c89522368b2561bf94a34d86d11eb62d.tar.xz) = 7e708f476f67a81c4b3f09de71a43b96a513b51770cbe6454a37c682799ce25ed9d0c2b04f35b87f4638689778a5f6e90538d622395e9550b230f71ecf01a56c