From 44683421d79f7ac5141ef69bdbdd9958336b6bbd Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Nov 04 2020 02:34:25 +0000 Subject: Bump to latest git, re-sync spec with upstream --- diff --git a/.gitignore b/.gitignore index 1d69389..c454684 100644 --- a/.gitignore +++ b/.gitignore @@ -94,3 +94,5 @@ /assetcache-5349e27e9036e6c6a53218a84f451a7999aa00fd.tar.xz /openQA-e9b44740c89522368b2561bf94a34d86d11eb62d.tar.gz /assetcache-e9b44740c89522368b2561bf94a34d86d11eb62d.tar.xz +/openQA-91baf79349a1310c8145e4b24169bca6881d55b7.tar.gz +/assetcache-91baf79349a1310c8145e4b24169bca6881d55b7.tar.xz diff --git a/0001-make-test-with-database-add-I-PWD-t-lib-back-to-PERL.patch b/0001-make-test-with-database-add-I-PWD-t-lib-back-to-PERL.patch deleted file mode 100644 index bda0cda..0000000 --- a/0001-make-test-with-database-add-I-PWD-t-lib-back-to-PERL.patch +++ /dev/null @@ -1,38 +0,0 @@ -From afa9b11bf9a96588111405b379de8c655b02a189 Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Mon, 10 Aug 2020 14:50:07 -0700 -Subject: [PATCH] `make test-with-database`: add -I$(PWD)/t/lib back to - PERL5OPT - -As discussed in https://github.com/os-autoinst/openQA/pull/3194 -while changing `-I$(PWD)/t/lib` to `-It/lib` made things work in -Docker, it broke them in Fedora's build system. We really don't -know why and it's a bit of a mystery, but it seems easier to just -have both than try and figure out the causes. - -Signed-off-by: Adam Williamson ---- - Makefile | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index a0acd14e9..d2880e2a8 100644 ---- a/Makefile -+++ b/Makefile -@@ -161,10 +161,12 @@ test-scheduler: - test-developer: - $(MAKE) test-with-database DEVELOPER_FULLSTACK=1 TIMEOUT_M=10 PROVE_ARGS="$$HARNESS t/33-developer_mode.t" RETRY=3 - -+# we have apparently-redundant -I args in PERL5OPT here because Docker -+# only works with one and Fedora's build system only works with the other - .PHONY: test-with-database - test-with-database: - test -d $(TEST_PG_PATH) && (pg_ctl -D $(TEST_PG_PATH) -s status >&/dev/null || pg_ctl -D $(TEST_PG_PATH) -s start) || ./t/test_postgresql $(TEST_PG_PATH) -- PERL5OPT="$(PERL5OPT) -It/lib -MOpenQA::Test::PatchDeparse" $(MAKE) test-unit-and-integration TEST_PG="DBI:Pg:dbname=openqa_test;host=$(TEST_PG_PATH)" -+ PERL5OPT="$(PERL5OPT) -It/lib -I$(PWD)/t/lib -MOpenQA::Test::PatchDeparse" $(MAKE) test-unit-and-integration TEST_PG="DBI:Pg:dbname=openqa_test;host=$(TEST_PG_PATH)" - -[ $(KEEP_DB) = 1 ] || pg_ctl -D $(TEST_PG_PATH) stop - - .PHONY: test-unit-and-integration --- -2.28.0 - diff --git a/openqa.spec b/openqa.spec index be06dac..45ebc7f 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 e9b44740c89522368b2561bf94a34d86d11eb62d +%global github_commit 91baf79349a1310c8145e4b24169bca6881d55b7 # if set, will be a post-release snapshot build, otherwise a 'normal' build -%global github_date 20200805 +%global github_date 20201103 %global shortcommit %(c=%{github_commit}; echo ${c:0:7}) # can't use linebreaks here! @@ -43,10 +43,10 @@ # 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.08 perl(Mojolicious) >= 8.55 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.12 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) +%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.026 perl(YAML::XS) perl(aliased) perl(base) perl(constant) perl(diagnostics) perl(strict) perl(warnings) # The following line is generated from dependencies.yaml (upstream) %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) @@ -86,7 +86,7 @@ Name: openqa Version: %{github_version} -Release: 54%{?github_date:.%{github_date}git%{shortcommit}}%{?dist} +Release: 55%{?github_date:.%{github_date}git%{shortcommit}}%{?dist} Summary: OS-level automated testing framework License: GPLv2+ Url: http://os-autoinst.github.io/openQA/ @@ -108,10 +108,6 @@ Source3: FedoraMessaging.pm # tests for the fedora-messaging publishing plugin Source4: 23-fedora-messaging.t -# Fix a weird perl lib path issues that breaks the tests in Fedora build env -# https://github.com/os-autoinst/openQA/pull/3302 -Patch0: 0001-make-test-with-database-add-I-PWD-t-lib-back-to-PERL.patch - BuildRequires: %{python_scripts_requires} BuildRequires: perl-generators # Standard for packages that have systemd services @@ -374,15 +370,24 @@ sed -i -e 's,unshare -r -n ,,g' t/40-script_openqa-clone-custom-git-refspec.t t/ # but with mock we get 'Connection refused', so just wipe it 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 +rm \ + t/01-test-utilities.t \ + t/17-labels_carry_over.t \ + t/25-cache-service.t \ + t/34-developer_mode-unit.t \ + t/44-scripts.t # XXX for mock builds, uncomment this: see # https://github.com/rpm-software-management/mock/issues/612 #rm t/40-openqa-clone-job.t +# "CI" set with longer timeouts as needed for higher performance variations +# within CI systems, e.g. OBS. See t/lib/OpenQA/Test/TimeLimit.pm +export CI=1 +export OPENQA_TEST_TIMEOUT_SCALE_CI=15 # 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="/" CHECKSTYLE=0 PROVE_ARGS='-l -r' TEST_PG_PATH=%{buildroot}/DB +make test GIT_CEILING_DIRECTORIES="/" CHECKSTYLE=0 PROVE_ARGS='-l -r' TEST_PG_PATH=%{buildroot}/DB rm -rf %{buildroot}/DB @@ -629,6 +634,9 @@ fi %{_datadir}/openqa/lib/OpenQA/WebAPI/Plugin/FedoraUpdateRestart.pm %changelog +* Tue Nov 03 2020 Adam Williamson - 4.6-55.20201103git91baf79 +- Bump to latest git, re-sync spec with upstream + * Fri Aug 07 2020 Adam Williamson - 4.6-54.20200805gite9b4474 - Fix FedoraUpdateRestart plugin for upstream code change diff --git a/sources b/sources index bce0a66..7a9565a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (openQA-e9b44740c89522368b2561bf94a34d86d11eb62d.tar.gz) = 687895369329230d360db77090dd793ef111ccf795e375299c20246227fe8e5c9d3cd447c20cd647249316799263672be925499cc1c52ca5b95e3232e2e39ec4 -SHA512 (assetcache-e9b44740c89522368b2561bf94a34d86d11eb62d.tar.xz) = 7e708f476f67a81c4b3f09de71a43b96a513b51770cbe6454a37c682799ce25ed9d0c2b04f35b87f4638689778a5f6e90538d622395e9550b230f71ecf01a56c +SHA512 (openQA-91baf79349a1310c8145e4b24169bca6881d55b7.tar.gz) = 791c0234913256dd51bb426fca701237d536b2bcd380022a2c52991c99d5b8ecb3384a251407d5dc55dae176dfa08d6cfb8175ef40d1bfed9e4966b5b41e0b1c +SHA512 (assetcache-91baf79349a1310c8145e4b24169bca6881d55b7.tar.xz) = 39a10e3571f784ceb1db07c31b44f5f771cc25abd732ba949bf2595b886bda8876b3719d6adac8e670117c2c7c79ac2ab8b951753f143507bf2a3c32bacb2d97