Architecture specific change in rpms/openqa.git
by githook-noreply＠fedoraproject.org
The package rpms/openqa.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/openqa.git/commit/?id=f13e41ed860....
Change:
+%ifarch x86_64
Thanks.
Full change:
============
commit f13e41ed86059006cd386ce1e9cb47e19e785f08
Author: Adam Williamson <awilliam(a)redhat.com>
Date: Thu Apr 30 15:58:20 2020 -0700
Bump to latest git again, backport a PR, resync spec
diff --git a/.gitignore b/.gitignore
index 53d41ab..30f21f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -88,3 +88,5 @@
/openQA-12cea51da8e77ae1553de81741392e299cae4005.tar.gz
/openQA-7160d88d931d9706ba1e55d66fd9f0ea5d9377b0.tar.gz
/assetcache-7160d88d931d9706ba1e55d66fd9f0ea5d9377b0.tar.xz
+/openQA-46234f90c3852646b7f80b88dcb9d8e5dca07f10.tar.gz
+/assetcache-46234f90c3852646b7f80b88dcb9d8e5dca07f10.tar.xz
diff --git a/0001-Fix-load_templates-clean-to-wipe-more-than-one-entry.patch b/0001-Fix-load_templates-clean-to-wipe-more-than-one-entry.patch
deleted file mode 100644
index 97f04c7..0000000
--- a/0001-Fix-load_templates-clean-to-wipe-more-than-one-entry.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-From edbef94836b6bfbc796819a0c3f59ae89de5f675 Mon Sep 17 00:00:00 2001
-From: Adam Williamson <awilliam(a)redhat.com>
-Date: Sat, 18 Apr 2020 11:38:37 -0700
-Subject: [PATCH] Fix load_templates --clean to wipe more than one entry per
- table
-
-1400d8a8dd inverted the logic here - instead of exiting the loop
-on a *failure* we now exit it on *success*. So each time --clean
-is run it will only wipe one entry per table. This obviously
-breaks things badly (the clean phase doesn't clean things right
-at all, so the subsequent load phase fails because we try to add
-entries that already exist, and you wind up with a mess).
-
-This flips the logic back, and adds a test.
-
-Signed-off-by: Adam Williamson <awilliam(a)redhat.com>
----
- script/load_templates | 2 +-
- t/01-compile-check-all.t | 3 ++-
- t/40-script_load_templates.t | 32 ++++++++++++++++++++++++-------
- t/data/40-templates-more.pl | 37 ++++++++++++++++++++++++++++++++++++
- 4 files changed, 65 insertions(+), 9 deletions(-)
- create mode 100644 t/data/40-templates-more.pl
-
-diff --git a/script/load_templates b/script/load_templates
-index 724a404f3..da089347c 100755
---- a/script/load_templates
-+++ b/script/load_templates
-@@ -241,7 +241,7 @@ if ($options{'clean'}) {
- my $id = $result->{$table}->[$i]->{id};
- my $table_url_id = $url->clone->path($options{'apibase'} . '/' . decamelize($table) . "/$id");
- $res = $client->delete($table_url_id)->res;
-- last if $res->is_success;
-+ last unless $res->is_success;
- }
- }
-
-diff --git a/t/01-compile-check-all.t b/t/01-compile-check-all.t
-index 5b620e3d5..b6cebd48e 100644
---- a/t/01-compile-check-all.t
-+++ b/t/01-compile-check-all.t
-@@ -27,8 +27,9 @@ $Test::Strict::TEST_WARNINGS = 1;
- $Test::Strict::TEST_SKIP = [
- # skip test module which would require test API from os-autoinst to be present
- 't/data/openqa/share/tests/opensuse/tests/installation/installer_timezone.pm',
-- # Skip data file which is supposed to resemble generated output which has no 'use' statements
-+ # Skip data files which are supposed to resemble generated output which has no 'use' statements
- 't/data/40-templates.pl',
-+ 't/data/40-templates-more.pl',
- 't/data/openqa-trigger-from-obs/Proj2::appliances/empty.txt',
- 't/data/openqa-trigger-from-obs/Proj3::standard/empty.txt',
- ];
-diff --git a/t/40-script_load_templates.t b/t/40-script_load_templates.t
-index 8be3e0c53..51f67e135 100644
---- a/t/40-script_load_templates.t
-+++ b/t/40-script_load_templates.t
-@@ -46,9 +46,10 @@ sub decode { Cpanel::JSON::XS->new->relaxed->decode(path(shift)->slurp); }
- test_once '--help', qr/Usage:/, 'help text shown', 1, 'load_templates with no arguments shows usage';
- test_once '--host', qr/Option host requires an argument/, 'host argument error shown', 1, 'required arguments missing';
-
--my $host = 'testhost:1234';
--my $filename = 't/data/40-templates.pl';
--my $args = "--host $host $filename";
-+my $host = 'testhost:1234';
-+my $filename = 't/data/40-templates.pl';
-+my $morefilename = 't/data/40-templates-more.pl';
-+my $args = "--host $host $filename";
- test_once $args, qr/unknown error code - host $host unreachable?/, 'invalid host error', 22, 'error on invalid host';
-
- $ENV{MOJO_LOG_LEVEL} = 'fatal';
-@@ -71,19 +72,36 @@ test_once $args, $expected, 'Admin may load templates', 0, 'successfully loaded
- test_once $args, qr/group with existing name/, 'Duplicate job group', 255, 'failed on duplicate job group';
-
- my $fh;
--($fh, $filename) = tempfile(UNLINK => 1, SUFFIX => '.json');
--$args = "--host $host --apikey $apikey --apisecret $apisecret --json > $filename";
-+my $tempfilename;
-+($fh, $tempfilename) = tempfile(UNLINK => 1, SUFFIX => '.json');
-+$args = "--host $host --apikey $apikey --apisecret $apisecret --json > $tempfilename";
- $expected = qr/^$/;
- dump_templates $args, $expected, 'dumped fixtures';
- # Clear the data in relevant tables
- $schema->resultset($_)->delete for qw(Machines TestSuites Products JobTemplates JobGroups);
--$args = "--host $host --apikey $apikey --apisecret $apisecret $filename";
-+$args = "--host $host --apikey $apikey --apisecret $apisecret $tempfilename";
- $expected = qr/JobGroups.+=> \{ added => 3, of => 3 \}/;
- test_once $args, $expected, 're-imported fixtures';
- my ($rh, $reference) = tempfile(UNLINK => 1, SUFFIX => '.json');
- $args = "--host $host --apikey $apikey --apisecret $apisecret --json > $reference";
- $expected = qr/^$/;
- dump_templates $args, $expected, 're-dumped fixtures';
--is_deeply decode($filename), decode($reference), 'both dumps match';
-+is_deeply decode($tempfilename), decode($reference), 'both dumps match';
-+
-+# Clear the data in relevant tables again
-+$schema->resultset($_)->delete for qw(Machines TestSuites Products JobTemplates JobGroups);
-+# load the templates file with 2 machines
-+$args = "--host $host --apikey $apikey --apisecret $apisecret $morefilename";
-+$expected = qr/Machines.+=> \{ added => 2, of => 2 \}/;
-+test_once $args, $expected, 'imported MOAR fixtures';
-+# wipe jobgroups manually as --clean explicitly skips it
-+$schema->resultset("JobGroups")->delete;
-+# now load the templates file with only 1 machine, with --clean
-+$args = "--host $host --apikey $apikey --apisecret $apisecret --clean $filename";
-+$expected = qr/Machines.+=> \{ added => 1, of => 1 \}/;
-+test_once $args, $expected, 'imported original fixtures';
-+is $schema->resultset('Machines')->count, 1, "only one machine is loaded";
-+my $machine = $schema->resultset('Machines')->first;
-+is $machine->name, "32bit", "correct machine is loaded";
-
- done_testing;
-diff --git a/t/data/40-templates-more.pl b/t/data/40-templates-more.pl
-new file mode 100644
-index 000000000..79f5fbb1e
---- /dev/null
-+++ b/t/data/40-templates-more.pl
-@@ -0,0 +1,37 @@
-+{
-+ JobGroups => [
-+ {
-+ group_name => "openSUSE Leap 42.3 Updates",
-+ template => "scenarios: {}\nproducts: {}\n",
-+ },
-+ ],
-+ JobTemplates => [],
-+ Machines => [
-+ {
-+ backend => "qemu",
-+ name => "32bit",
-+ settings => [],
-+ },
-+ {
-+ backend => "qemu",
-+ name => "64bit",
-+ settings => [],
-+ },
-+ ],
-+ Products => [
-+ {
-+ arch => "x86_64",
-+ distri => "opensuse",
-+ flavor => "DVD",
-+ settings => [],
-+ version => 42.2,
-+ },
-+ ],
-+ TestSuites => [
-+ {
-+ name => "uefi",
-+ settings =>
-+ [{key => "DESKTOP", value => "kde"}, {key => "INSTALLONLY", value => 1}, {key => "UEFI", value => 1},],
-+ },
-+ ],
-+}
---
-2.26.1
-
diff --git a/0001-Fix-missing_assets-to-ignore-repos-not-hidden-assets.patch b/0001-Fix-missing_assets-to-ignore-repos-not-hidden-assets.patch
new file mode 100644
index 0000000..f27d9de
--- /dev/null
+++ b/0001-Fix-missing_assets-to-ignore-repos-not-hidden-assets.patch
@@ -0,0 +1,53 @@
+From 4a09dedd5f1a09b2f5df817a3c097a968f8e1b5a Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam(a)redhat.com>
+Date: Wed, 29 Apr 2020 12:50:35 -0700
+Subject: [PATCH] Fix missing_assets to ignore repos, not 'hidden assets'
+
+As discussed in
+https://github.com/os-autoinst/openQA/pull/2676#issuecomment-615951653
+and follow-ups, this check misunderstands the "hidden" attribute.
+The code assumes that "hidden" assets are the same thing as
+"assets we don't really want to copy down when cloning jobs",
+but they are not. The "hidden" attribute was written (by me) to
+mean "asset types not to be shown for downloading in the web UI".
+
+For SUSE, it happens to be the case that ["repo"] would be the
+right array of both "not-to-be-shown-in-the-web-ui assets" and
+"non-clonable assets", so this bug wasn't apparent, as SUSE
+deployments leave the `hide_asset_types` config setting at its
+default value of just 'repo'. But on Fedora deployments, this
+setting is changed to 'repo iso hdd' (because we don't want to
+show those asset types for download in the web UI), so this code
+also ignored ISO and HDD assets when checking for "missing"
+assets, which we don't want.
+
+As discussed in the pull request we could potentially make this
+a configurable attribute and have the clone_job script use it
+too, but doing that is a bit harder, and I don't think for now
+anyone wants a different definition of "non-clonable assets", so
+it doesn't seem really necessary.
+
+Signed-off-by: Adam Williamson <awilliam(a)redhat.com>
+---
+ lib/OpenQA/Schema/Result/Jobs.pm | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/lib/OpenQA/Schema/Result/Jobs.pm b/lib/OpenQA/Schema/Result/Jobs.pm
+index 8ae786659..5bbf0cb41 100644
+--- a/lib/OpenQA/Schema/Result/Jobs.pm
++++ b/lib/OpenQA/Schema/Result/Jobs.pm
+@@ -572,8 +572,10 @@ sub missing_assets {
+ delete $assets->{UEFI_PFLASH_VARS};
+
+ my $parent_job_ids = $self->_parent_job_ids;
++ # ignore repos, as they're not really clonable: see
++ # https://github.com/os-autoinst/openQA/pull/2676#issuecomment-616312026
+ my @relevant_assets
+- = grep { $_->{name} ne '' && !OpenQA::Schema::Result::Assets::is_type_hidden($_->{type}) } values %$assets;
++ = grep { $_->{name} ne '' && $_->{type} ne 'repo' } values %$assets;
+ my @assets_query = map {
+ {
+ type => $_->{type},
+--
+2.26.2
+
diff --git a/openqa.spec b/openqa.spec
index fc38091..4666a4b 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 7160d88d931d9706ba1e55d66fd9f0ea5d9377b0
+%global github_commit 46234f90c3852646b7f80b88dcb9d8e5dca07f10
# if set, will be a post-release snapshot build, otherwise a 'normal' build
-%global github_date 20200415
+%global github_date 20200429
%global shortcommit %(c=%{github_commit}; echo ${c:0:7})
# can't use linebreaks here!
@@ -39,34 +39,50 @@
%endif
%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(Archive::Extract) 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.24, perl(Try::Tiny) perl(Regexp::Common), perl(Storable)
+
+# 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.24 perl(Regexp::Common) perl(Storable) perl(Try::Tiny)
# 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(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::PP) perl(YAML::XS) >= 0.67, perl(LWP::UserAgent) perl(Getopt::Long::Descriptive) perl(Time::Seconds) perl(Time::Piece)
-%define client_requires curl jq git-core perl(IO::Socket::SSL) >= 2.009, perl(JSON::Validator) perl(LWP::UserAgent) perl(LWP::Protocol::https) perl(IPC::Run) perl(YAML::PP) >= 0.020 perl(YAML::XS)
-%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
+# 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)
+# The following line is generated from dependencies.yaml (upstream)
+%define client_requires curl git-core jq perl(IO::Socket::SSL) >= 2.009 perl(IPC::Run) perl(JSON::Validator) perl(LWP::Protocol::https) perl(LWP::UserAgent) 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)
+# The following line is generated from dependencies.yaml (upstream)
+%define build_requires %assetpack_requires rubygem(sass)
# All requirements needed by the tests executed during build-time.
# 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,
-# 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 curl jq
+# 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), Test::MockObject and Test::Exception added as
+# upstream is missing them - https://github.com/os-autoinst/openQA/pull/3018
+# 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::More) perl(Test::Output) perl(Test::Pod) perl(Test::Strict) perl(Test::Warnings) postgresql-server
+%ifarch x86_64
+%define qemu qemu qemu-kvm
+%else
+%define qemu qemu
+%endif
# 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)
+# The following line is generated from dependencies.yaml
+%define devel_requires %build_requires %qemu %test_requires curl perl(Devel::Cover) perl(Perl::Tidy) postgresql-devel rsync sudo tar
Name: openqa
Version: %{github_version}
-Release: 48%{?github_date:.%{github_date}git%{shortcommit}}%{?dist}
+Release: 49%{?github_date:.%{github_date}git%{shortcommit}}%{?dist}
Summary: OS-level automated testing framework
License: GPLv2+
Url: http://os-autoinst.github.io/openQA/
@@ -88,9 +104,11 @@ Source3: FedoraMessaging.pm
# tests for the fedora-messaging publishing plugin
Source4: 23-fedora-messaging.t
-# https://github.com/os-autoinst/openQA/pull/2955
-# Fix a logic error in `load_templates --clean` that breaks it
-Patch0: 0001-Fix-load_templates-clean-to-wipe-more-than-one-entry.patch
+# https://github.com/os-autoinst/openQA/pull/3017
+# Missing asset check shouldn't use 'hidden' attribute as it doesn't
+# mean what the author thought it meant, made the check ignore most
+# assets on Fedora
+Patch0: 0001-Fix-missing_assets-to-ignore-repos-not-hidden-assets.patch
BuildRequires: %{python_scripts_requires}
BuildRequires: perl-generators
@@ -305,6 +323,7 @@ ln -s %{_sysconfdir}/openqa/openqa.ini %{buildroot}%{_datadir}/openqa/etc/openqa
ln -s %{_sysconfdir}/openqa/database.ini %{buildroot}%{_datadir}/openqa/etc/openqa/database.ini
mkdir -p %{buildroot}%{_bindir}
ln -s %{_datadir}/openqa/script/client %{buildroot}%{_bindir}/openqa-client
+ln -s %{_datadir}/openqa/script/openqa-cli %{buildroot}%{_bindir}/openqa-cli
ln -s %{_datadir}/openqa/script/openqa-clone-job %{buildroot}%{_bindir}/openqa-clone-job
ln -s %{_datadir}/openqa/script/dump_templates %{buildroot}%{_bindir}/openqa-dump-templates
ln -s %{_datadir}/openqa/script/load_templates %{buildroot}%{_bindir}/openqa-load-templates
@@ -337,7 +356,10 @@ export LC_ALL=en_US.UTF-8
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 t/40-openqa-clone-job.t
+sed -i -e 's,unshare -r -n ,,g' t/40-script_openqa-clone-custom-git-refspec.t t/40-openqa-clone-job.t t/32-openqa_client-script.t
+# this test expects a 'not connected' error that it gets with unshare
+# 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
@@ -436,7 +458,6 @@ fi
%{_datadir}/openqa/dbicdh
%{_datadir}/openqa/assets
%dir %{_datadir}/openqa/script
-%{_datadir}/openqa/script/check_dependencies
%{_datadir}/openqa/script/create_admin
%{_datadir}/openqa/script/fetchneedles
%{_datadir}/openqa/script/initdb
@@ -541,6 +562,7 @@ fi
%{_datadir}/openqa/script/clone_job.pl
%{_datadir}/openqa/script/dump_templates
%{_datadir}/openqa/script/load_templates
+%{_datadir}/openqa/script/openqa-cli
%{_datadir}/openqa/script/openqa-clone-job
%{_datadir}/openqa/script/openqa-clone-custom-git-refspec
%{_datadir}/openqa/script/openqa-validate-yaml
@@ -550,6 +572,7 @@ fi
%{_datadir}/openqa/lib/OpenQA/Client
%{_datadir}/openqa/lib/OpenQA/UserAgent.pm
%{_bindir}/openqa-client
+%{_bindir}/openqa-cli
%{_bindir}/openqa-clone-job
%{_bindir}/openqa-dump-templates
%{_bindir}/openqa-load-templates
@@ -579,6 +602,11 @@ fi
%{_datadir}/openqa/lib/OpenQA/WebAPI/Plugin/FedoraUpdateRestart.pm
%changelog
+* Wed Apr 29 2020 Adam Williamson <awilliam(a)redhat.com> - 4.6-49.20200429git46234f9
+- Bump to latest git
+- Resync spec with upstream
+- Backport PR #3017: missing asset check shouldn't use 'hidden' asset attribute
+
* Sat Apr 18 2020 Adam Williamson <awilliam(a)redhat.com> - 4.6-48.20200415git7160d88
- Backport PR #2955 to fix broken load_templates --clean
diff --git a/sources b/sources
index 7806994..04f7ca5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (openQA-7160d88d931d9706ba1e55d66fd9f0ea5d9377b0.tar.gz) = 55c75bbf148b0cc1360f1ec5cd3d7eeb520d171b79a47c31b5e943495dd5607ed0b4d72f694933f435b8c026a11083ff2f6ec229d4f45db77be3aa197d014f6c
-SHA512 (assetcache-7160d88d931d9706ba1e55d66fd9f0ea5d9377b0.tar.xz) = 75711f1242f2bba05d3625f90c4403fd85e04265814b72e58db542875d5e4eecbd10a374f4d4f5f232ef05dec15ff7bd7436c132372119d49fed0a8e03bffda8
+SHA512 (openQA-46234f90c3852646b7f80b88dcb9d8e5dca07f10.tar.gz) = 8674b1555f070596d3dc5a55388a212758c89627c9d1f037ca9845705ec3d419209c378d5dba880fc2c184c9877c4cbc67fba2e468f3b8fbad93e0d45c9b2086
+SHA512 (assetcache-46234f90c3852646b7f80b88dcb9d8e5dca07f10.tar.xz) = 01d51e33c1eb59898fdc9b8e7dd52a11146a302af441b61512bafe03b4a80806d7224d22c663a1c9c2d13fd74f30430cb837de2584790dd12b5c9bf45a772503
3 years, 4 months
- 1
- 0
Architecture specific change in rpms/openqa.git
by githook-noreply＠fedoraproject.org
The package rpms/openqa.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/openqa.git/commit/?id=f13e41ed860....
Change:
+%ifarch x86_64
Thanks.
Full change:
============
commit f13e41ed86059006cd386ce1e9cb47e19e785f08
Author: Adam Williamson <awilliam(a)redhat.com>
Date: Thu Apr 30 15:58:20 2020 -0700
Bump to latest git again, backport a PR, resync spec
diff --git a/.gitignore b/.gitignore
index 53d41ab..30f21f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -88,3 +88,5 @@
/openQA-12cea51da8e77ae1553de81741392e299cae4005.tar.gz
/openQA-7160d88d931d9706ba1e55d66fd9f0ea5d9377b0.tar.gz
/assetcache-7160d88d931d9706ba1e55d66fd9f0ea5d9377b0.tar.xz
+/openQA-46234f90c3852646b7f80b88dcb9d8e5dca07f10.tar.gz
+/assetcache-46234f90c3852646b7f80b88dcb9d8e5dca07f10.tar.xz
diff --git a/0001-Fix-load_templates-clean-to-wipe-more-than-one-entry.patch b/0001-Fix-load_templates-clean-to-wipe-more-than-one-entry.patch
deleted file mode 100644
index 97f04c7..0000000
--- a/0001-Fix-load_templates-clean-to-wipe-more-than-one-entry.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-From edbef94836b6bfbc796819a0c3f59ae89de5f675 Mon Sep 17 00:00:00 2001
-From: Adam Williamson <awilliam(a)redhat.com>
-Date: Sat, 18 Apr 2020 11:38:37 -0700
-Subject: [PATCH] Fix load_templates --clean to wipe more than one entry per
- table
-
-1400d8a8dd inverted the logic here - instead of exiting the loop
-on a *failure* we now exit it on *success*. So each time --clean
-is run it will only wipe one entry per table. This obviously
-breaks things badly (the clean phase doesn't clean things right
-at all, so the subsequent load phase fails because we try to add
-entries that already exist, and you wind up with a mess).
-
-This flips the logic back, and adds a test.
-
-Signed-off-by: Adam Williamson <awilliam(a)redhat.com>
----
- script/load_templates | 2 +-
- t/01-compile-check-all.t | 3 ++-
- t/40-script_load_templates.t | 32 ++++++++++++++++++++++++-------
- t/data/40-templates-more.pl | 37 ++++++++++++++++++++++++++++++++++++
- 4 files changed, 65 insertions(+), 9 deletions(-)
- create mode 100644 t/data/40-templates-more.pl
-
-diff --git a/script/load_templates b/script/load_templates
-index 724a404f3..da089347c 100755
---- a/script/load_templates
-+++ b/script/load_templates
-@@ -241,7 +241,7 @@ if ($options{'clean'}) {
- my $id = $result->{$table}->[$i]->{id};
- my $table_url_id = $url->clone->path($options{'apibase'} . '/' . decamelize($table) . "/$id");
- $res = $client->delete($table_url_id)->res;
-- last if $res->is_success;
-+ last unless $res->is_success;
- }
- }
-
-diff --git a/t/01-compile-check-all.t b/t/01-compile-check-all.t
-index 5b620e3d5..b6cebd48e 100644
---- a/t/01-compile-check-all.t
-+++ b/t/01-compile-check-all.t
-@@ -27,8 +27,9 @@ $Test::Strict::TEST_WARNINGS = 1;
- $Test::Strict::TEST_SKIP = [
- # skip test module which would require test API from os-autoinst to be present
- 't/data/openqa/share/tests/opensuse/tests/installation/installer_timezone.pm',
-- # Skip data file which is supposed to resemble generated output which has no 'use' statements
-+ # Skip data files which are supposed to resemble generated output which has no 'use' statements
- 't/data/40-templates.pl',
-+ 't/data/40-templates-more.pl',
- 't/data/openqa-trigger-from-obs/Proj2::appliances/empty.txt',
- 't/data/openqa-trigger-from-obs/Proj3::standard/empty.txt',
- ];
-diff --git a/t/40-script_load_templates.t b/t/40-script_load_templates.t
-index 8be3e0c53..51f67e135 100644
---- a/t/40-script_load_templates.t
-+++ b/t/40-script_load_templates.t
-@@ -46,9 +46,10 @@ sub decode { Cpanel::JSON::XS->new->relaxed->decode(path(shift)->slurp); }
- test_once '--help', qr/Usage:/, 'help text shown', 1, 'load_templates with no arguments shows usage';
- test_once '--host', qr/Option host requires an argument/, 'host argument error shown', 1, 'required arguments missing';
-
--my $host = 'testhost:1234';
--my $filename = 't/data/40-templates.pl';
--my $args = "--host $host $filename";
-+my $host = 'testhost:1234';
-+my $filename = 't/data/40-templates.pl';
-+my $morefilename = 't/data/40-templates-more.pl';
-+my $args = "--host $host $filename";
- test_once $args, qr/unknown error code - host $host unreachable?/, 'invalid host error', 22, 'error on invalid host';
-
- $ENV{MOJO_LOG_LEVEL} = 'fatal';
-@@ -71,19 +72,36 @@ test_once $args, $expected, 'Admin may load templates', 0, 'successfully loaded
- test_once $args, qr/group with existing name/, 'Duplicate job group', 255, 'failed on duplicate job group';
-
- my $fh;
--($fh, $filename) = tempfile(UNLINK => 1, SUFFIX => '.json');
--$args = "--host $host --apikey $apikey --apisecret $apisecret --json > $filename";
-+my $tempfilename;
-+($fh, $tempfilename) = tempfile(UNLINK => 1, SUFFIX => '.json');
-+$args = "--host $host --apikey $apikey --apisecret $apisecret --json > $tempfilename";
- $expected = qr/^$/;
- dump_templates $args, $expected, 'dumped fixtures';
- # Clear the data in relevant tables
- $schema->resultset($_)->delete for qw(Machines TestSuites Products JobTemplates JobGroups);
--$args = "--host $host --apikey $apikey --apisecret $apisecret $filename";
-+$args = "--host $host --apikey $apikey --apisecret $apisecret $tempfilename";
- $expected = qr/JobGroups.+=> \{ added => 3, of => 3 \}/;
- test_once $args, $expected, 're-imported fixtures';
- my ($rh, $reference) = tempfile(UNLINK => 1, SUFFIX => '.json');
- $args = "--host $host --apikey $apikey --apisecret $apisecret --json > $reference";
- $expected = qr/^$/;
- dump_templates $args, $expected, 're-dumped fixtures';
--is_deeply decode($filename), decode($reference), 'both dumps match';
-+is_deeply decode($tempfilename), decode($reference), 'both dumps match';
-+
-+# Clear the data in relevant tables again
-+$schema->resultset($_)->delete for qw(Machines TestSuites Products JobTemplates JobGroups);
-+# load the templates file with 2 machines
-+$args = "--host $host --apikey $apikey --apisecret $apisecret $morefilename";
-+$expected = qr/Machines.+=> \{ added => 2, of => 2 \}/;
-+test_once $args, $expected, 'imported MOAR fixtures';
-+# wipe jobgroups manually as --clean explicitly skips it
-+$schema->resultset("JobGroups")->delete;
-+# now load the templates file with only 1 machine, with --clean
-+$args = "--host $host --apikey $apikey --apisecret $apisecret --clean $filename";
-+$expected = qr/Machines.+=> \{ added => 1, of => 1 \}/;
-+test_once $args, $expected, 'imported original fixtures';
-+is $schema->resultset('Machines')->count, 1, "only one machine is loaded";
-+my $machine = $schema->resultset('Machines')->first;
-+is $machine->name, "32bit", "correct machine is loaded";
-
- done_testing;
-diff --git a/t/data/40-templates-more.pl b/t/data/40-templates-more.pl
-new file mode 100644
-index 000000000..79f5fbb1e
---- /dev/null
-+++ b/t/data/40-templates-more.pl
-@@ -0,0 +1,37 @@
-+{
-+ JobGroups => [
-+ {
-+ group_name => "openSUSE Leap 42.3 Updates",
-+ template => "scenarios: {}\nproducts: {}\n",
-+ },
-+ ],
-+ JobTemplates => [],
-+ Machines => [
-+ {
-+ backend => "qemu",
-+ name => "32bit",
-+ settings => [],
-+ },
-+ {
-+ backend => "qemu",
-+ name => "64bit",
-+ settings => [],
-+ },
-+ ],
-+ Products => [
-+ {
-+ arch => "x86_64",
-+ distri => "opensuse",
-+ flavor => "DVD",
-+ settings => [],
-+ version => 42.2,
-+ },
-+ ],
-+ TestSuites => [
-+ {
-+ name => "uefi",
-+ settings =>
-+ [{key => "DESKTOP", value => "kde"}, {key => "INSTALLONLY", value => 1}, {key => "UEFI", value => 1},],
-+ },
-+ ],
-+}
---
-2.26.1
-
diff --git a/0001-Fix-missing_assets-to-ignore-repos-not-hidden-assets.patch b/0001-Fix-missing_assets-to-ignore-repos-not-hidden-assets.patch
new file mode 100644
index 0000000..f27d9de
--- /dev/null
+++ b/0001-Fix-missing_assets-to-ignore-repos-not-hidden-assets.patch
@@ -0,0 +1,53 @@
+From 4a09dedd5f1a09b2f5df817a3c097a968f8e1b5a Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam(a)redhat.com>
+Date: Wed, 29 Apr 2020 12:50:35 -0700
+Subject: [PATCH] Fix missing_assets to ignore repos, not 'hidden assets'
+
+As discussed in
+https://github.com/os-autoinst/openQA/pull/2676#issuecomment-615951653
+and follow-ups, this check misunderstands the "hidden" attribute.
+The code assumes that "hidden" assets are the same thing as
+"assets we don't really want to copy down when cloning jobs",
+but they are not. The "hidden" attribute was written (by me) to
+mean "asset types not to be shown for downloading in the web UI".
+
+For SUSE, it happens to be the case that ["repo"] would be the
+right array of both "not-to-be-shown-in-the-web-ui assets" and
+"non-clonable assets", so this bug wasn't apparent, as SUSE
+deployments leave the `hide_asset_types` config setting at its
+default value of just 'repo'. But on Fedora deployments, this
+setting is changed to 'repo iso hdd' (because we don't want to
+show those asset types for download in the web UI), so this code
+also ignored ISO and HDD assets when checking for "missing"
+assets, which we don't want.
+
+As discussed in the pull request we could potentially make this
+a configurable attribute and have the clone_job script use it
+too, but doing that is a bit harder, and I don't think for now
+anyone wants a different definition of "non-clonable assets", so
+it doesn't seem really necessary.
+
+Signed-off-by: Adam Williamson <awilliam(a)redhat.com>
+---
+ lib/OpenQA/Schema/Result/Jobs.pm | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/lib/OpenQA/Schema/Result/Jobs.pm b/lib/OpenQA/Schema/Result/Jobs.pm
+index 8ae786659..5bbf0cb41 100644
+--- a/lib/OpenQA/Schema/Result/Jobs.pm
++++ b/lib/OpenQA/Schema/Result/Jobs.pm
+@@ -572,8 +572,10 @@ sub missing_assets {
+ delete $assets->{UEFI_PFLASH_VARS};
+
+ my $parent_job_ids = $self->_parent_job_ids;
++ # ignore repos, as they're not really clonable: see
++ # https://github.com/os-autoinst/openQA/pull/2676#issuecomment-616312026
+ my @relevant_assets
+- = grep { $_->{name} ne '' && !OpenQA::Schema::Result::Assets::is_type_hidden($_->{type}) } values %$assets;
++ = grep { $_->{name} ne '' && $_->{type} ne 'repo' } values %$assets;
+ my @assets_query = map {
+ {
+ type => $_->{type},
+--
+2.26.2
+
diff --git a/openqa.spec b/openqa.spec
index fc38091..4666a4b 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 7160d88d931d9706ba1e55d66fd9f0ea5d9377b0
+%global github_commit 46234f90c3852646b7f80b88dcb9d8e5dca07f10
# if set, will be a post-release snapshot build, otherwise a 'normal' build
-%global github_date 20200415
+%global github_date 20200429
%global shortcommit %(c=%{github_commit}; echo ${c:0:7})
# can't use linebreaks here!
@@ -39,34 +39,50 @@
%endif
%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(Archive::Extract) 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.24, perl(Try::Tiny) perl(Regexp::Common), perl(Storable)
+
+# 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.24 perl(Regexp::Common) perl(Storable) perl(Try::Tiny)
# 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(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::PP) perl(YAML::XS) >= 0.67, perl(LWP::UserAgent) perl(Getopt::Long::Descriptive) perl(Time::Seconds) perl(Time::Piece)
-%define client_requires curl jq git-core perl(IO::Socket::SSL) >= 2.009, perl(JSON::Validator) perl(LWP::UserAgent) perl(LWP::Protocol::https) perl(IPC::Run) perl(YAML::PP) >= 0.020 perl(YAML::XS)
-%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
+# 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)
+# The following line is generated from dependencies.yaml (upstream)
+%define client_requires curl git-core jq perl(IO::Socket::SSL) >= 2.009 perl(IPC::Run) perl(JSON::Validator) perl(LWP::Protocol::https) perl(LWP::UserAgent) 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)
+# The following line is generated from dependencies.yaml (upstream)
+%define build_requires %assetpack_requires rubygem(sass)
# All requirements needed by the tests executed during build-time.
# 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,
-# 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 curl jq
+# 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), Test::MockObject and Test::Exception added as
+# upstream is missing them - https://github.com/os-autoinst/openQA/pull/3018
+# 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::More) perl(Test::Output) perl(Test::Pod) perl(Test::Strict) perl(Test::Warnings) postgresql-server
+%ifarch x86_64
+%define qemu qemu qemu-kvm
+%else
+%define qemu qemu
+%endif
# 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)
+# The following line is generated from dependencies.yaml
+%define devel_requires %build_requires %qemu %test_requires curl perl(Devel::Cover) perl(Perl::Tidy) postgresql-devel rsync sudo tar
Name: openqa
Version: %{github_version}
-Release: 48%{?github_date:.%{github_date}git%{shortcommit}}%{?dist}
+Release: 49%{?github_date:.%{github_date}git%{shortcommit}}%{?dist}
Summary: OS-level automated testing framework
License: GPLv2+
Url: http://os-autoinst.github.io/openQA/
@@ -88,9 +104,11 @@ Source3: FedoraMessaging.pm
# tests for the fedora-messaging publishing plugin
Source4: 23-fedora-messaging.t
-# https://github.com/os-autoinst/openQA/pull/2955
-# Fix a logic error in `load_templates --clean` that breaks it
-Patch0: 0001-Fix-load_templates-clean-to-wipe-more-than-one-entry.patch
+# https://github.com/os-autoinst/openQA/pull/3017
+# Missing asset check shouldn't use 'hidden' attribute as it doesn't
+# mean what the author thought it meant, made the check ignore most
+# assets on Fedora
+Patch0: 0001-Fix-missing_assets-to-ignore-repos-not-hidden-assets.patch
BuildRequires: %{python_scripts_requires}
BuildRequires: perl-generators
@@ -305,6 +323,7 @@ ln -s %{_sysconfdir}/openqa/openqa.ini %{buildroot}%{_datadir}/openqa/etc/openqa
ln -s %{_sysconfdir}/openqa/database.ini %{buildroot}%{_datadir}/openqa/etc/openqa/database.ini
mkdir -p %{buildroot}%{_bindir}
ln -s %{_datadir}/openqa/script/client %{buildroot}%{_bindir}/openqa-client
+ln -s %{_datadir}/openqa/script/openqa-cli %{buildroot}%{_bindir}/openqa-cli
ln -s %{_datadir}/openqa/script/openqa-clone-job %{buildroot}%{_bindir}/openqa-clone-job
ln -s %{_datadir}/openqa/script/dump_templates %{buildroot}%{_bindir}/openqa-dump-templates
ln -s %{_datadir}/openqa/script/load_templates %{buildroot}%{_bindir}/openqa-load-templates
@@ -337,7 +356,10 @@ export LC_ALL=en_US.UTF-8
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 t/40-openqa-clone-job.t
+sed -i -e 's,unshare -r -n ,,g' t/40-script_openqa-clone-custom-git-refspec.t t/40-openqa-clone-job.t t/32-openqa_client-script.t
+# this test expects a 'not connected' error that it gets with unshare
+# 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
@@ -436,7 +458,6 @@ fi
%{_datadir}/openqa/dbicdh
%{_datadir}/openqa/assets
%dir %{_datadir}/openqa/script
-%{_datadir}/openqa/script/check_dependencies
%{_datadir}/openqa/script/create_admin
%{_datadir}/openqa/script/fetchneedles
%{_datadir}/openqa/script/initdb
@@ -541,6 +562,7 @@ fi
%{_datadir}/openqa/script/clone_job.pl
%{_datadir}/openqa/script/dump_templates
%{_datadir}/openqa/script/load_templates
+%{_datadir}/openqa/script/openqa-cli
%{_datadir}/openqa/script/openqa-clone-job
%{_datadir}/openqa/script/openqa-clone-custom-git-refspec
%{_datadir}/openqa/script/openqa-validate-yaml
@@ -550,6 +572,7 @@ fi
%{_datadir}/openqa/lib/OpenQA/Client
%{_datadir}/openqa/lib/OpenQA/UserAgent.pm
%{_bindir}/openqa-client
+%{_bindir}/openqa-cli
%{_bindir}/openqa-clone-job
%{_bindir}/openqa-dump-templates
%{_bindir}/openqa-load-templates
@@ -579,6 +602,11 @@ fi
%{_datadir}/openqa/lib/OpenQA/WebAPI/Plugin/FedoraUpdateRestart.pm
%changelog
+* Wed Apr 29 2020 Adam Williamson <awilliam(a)redhat.com> - 4.6-49.20200429git46234f9
+- Bump to latest git
+- Resync spec with upstream
+- Backport PR #3017: missing asset check shouldn't use 'hidden' asset attribute
+
* Sat Apr 18 2020 Adam Williamson <awilliam(a)redhat.com> - 4.6-48.20200415git7160d88
- Backport PR #2955 to fix broken load_templates --clean
diff --git a/sources b/sources
index 7806994..04f7ca5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (openQA-7160d88d931d9706ba1e55d66fd9f0ea5d9377b0.tar.gz) = 55c75bbf148b0cc1360f1ec5cd3d7eeb520d171b79a47c31b5e943495dd5607ed0b4d72f694933f435b8c026a11083ff2f6ec229d4f45db77be3aa197d014f6c
-SHA512 (assetcache-7160d88d931d9706ba1e55d66fd9f0ea5d9377b0.tar.xz) = 75711f1242f2bba05d3625f90c4403fd85e04265814b72e58db542875d5e4eecbd10a374f4d4f5f232ef05dec15ff7bd7436c132372119d49fed0a8e03bffda8
+SHA512 (openQA-46234f90c3852646b7f80b88dcb9d8e5dca07f10.tar.gz) = 8674b1555f070596d3dc5a55388a212758c89627c9d1f037ca9845705ec3d419209c378d5dba880fc2c184c9877c4cbc67fba2e468f3b8fbad93e0d45c9b2086
+SHA512 (assetcache-46234f90c3852646b7f80b88dcb9d8e5dca07f10.tar.xz) = 01d51e33c1eb59898fdc9b8e7dd52a11146a302af441b61512bafe03b4a80806d7224d22c663a1c9c2d13fd74f30430cb837de2584790dd12b5c9bf45a772503
3 years, 4 months
- 1
- 0
Architecture specific change in rpms/openqa.git
by githook-noreply＠fedoraproject.org
The package rpms/openqa.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/openqa.git/commit/?id=f13e41ed860....
Change:
+%ifarch x86_64
Thanks.
Full change:
============
commit f13e41ed86059006cd386ce1e9cb47e19e785f08
Author: Adam Williamson <awilliam(a)redhat.com>
Date: Thu Apr 30 15:58:20 2020 -0700
Bump to latest git again, backport a PR, resync spec
diff --git a/.gitignore b/.gitignore
index 53d41ab..30f21f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -88,3 +88,5 @@
/openQA-12cea51da8e77ae1553de81741392e299cae4005.tar.gz
/openQA-7160d88d931d9706ba1e55d66fd9f0ea5d9377b0.tar.gz
/assetcache-7160d88d931d9706ba1e55d66fd9f0ea5d9377b0.tar.xz
+/openQA-46234f90c3852646b7f80b88dcb9d8e5dca07f10.tar.gz
+/assetcache-46234f90c3852646b7f80b88dcb9d8e5dca07f10.tar.xz
diff --git a/0001-Fix-load_templates-clean-to-wipe-more-than-one-entry.patch b/0001-Fix-load_templates-clean-to-wipe-more-than-one-entry.patch
deleted file mode 100644
index 97f04c7..0000000
--- a/0001-Fix-load_templates-clean-to-wipe-more-than-one-entry.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-From edbef94836b6bfbc796819a0c3f59ae89de5f675 Mon Sep 17 00:00:00 2001
-From: Adam Williamson <awilliam(a)redhat.com>
-Date: Sat, 18 Apr 2020 11:38:37 -0700
-Subject: [PATCH] Fix load_templates --clean to wipe more than one entry per
- table
-
-1400d8a8dd inverted the logic here - instead of exiting the loop
-on a *failure* we now exit it on *success*. So each time --clean
-is run it will only wipe one entry per table. This obviously
-breaks things badly (the clean phase doesn't clean things right
-at all, so the subsequent load phase fails because we try to add
-entries that already exist, and you wind up with a mess).
-
-This flips the logic back, and adds a test.
-
-Signed-off-by: Adam Williamson <awilliam(a)redhat.com>
----
- script/load_templates | 2 +-
- t/01-compile-check-all.t | 3 ++-
- t/40-script_load_templates.t | 32 ++++++++++++++++++++++++-------
- t/data/40-templates-more.pl | 37 ++++++++++++++++++++++++++++++++++++
- 4 files changed, 65 insertions(+), 9 deletions(-)
- create mode 100644 t/data/40-templates-more.pl
-
-diff --git a/script/load_templates b/script/load_templates
-index 724a404f3..da089347c 100755
---- a/script/load_templates
-+++ b/script/load_templates
-@@ -241,7 +241,7 @@ if ($options{'clean'}) {
- my $id = $result->{$table}->[$i]->{id};
- my $table_url_id = $url->clone->path($options{'apibase'} . '/' . decamelize($table) . "/$id");
- $res = $client->delete($table_url_id)->res;
-- last if $res->is_success;
-+ last unless $res->is_success;
- }
- }
-
-diff --git a/t/01-compile-check-all.t b/t/01-compile-check-all.t
-index 5b620e3d5..b6cebd48e 100644
---- a/t/01-compile-check-all.t
-+++ b/t/01-compile-check-all.t
-@@ -27,8 +27,9 @@ $Test::Strict::TEST_WARNINGS = 1;
- $Test::Strict::TEST_SKIP = [
- # skip test module which would require test API from os-autoinst to be present
- 't/data/openqa/share/tests/opensuse/tests/installation/installer_timezone.pm',
-- # Skip data file which is supposed to resemble generated output which has no 'use' statements
-+ # Skip data files which are supposed to resemble generated output which has no 'use' statements
- 't/data/40-templates.pl',
-+ 't/data/40-templates-more.pl',
- 't/data/openqa-trigger-from-obs/Proj2::appliances/empty.txt',
- 't/data/openqa-trigger-from-obs/Proj3::standard/empty.txt',
- ];
-diff --git a/t/40-script_load_templates.t b/t/40-script_load_templates.t
-index 8be3e0c53..51f67e135 100644
---- a/t/40-script_load_templates.t
-+++ b/t/40-script_load_templates.t
-@@ -46,9 +46,10 @@ sub decode { Cpanel::JSON::XS->new->relaxed->decode(path(shift)->slurp); }
- test_once '--help', qr/Usage:/, 'help text shown', 1, 'load_templates with no arguments shows usage';
- test_once '--host', qr/Option host requires an argument/, 'host argument error shown', 1, 'required arguments missing';
-
--my $host = 'testhost:1234';
--my $filename = 't/data/40-templates.pl';
--my $args = "--host $host $filename";
-+my $host = 'testhost:1234';
-+my $filename = 't/data/40-templates.pl';
-+my $morefilename = 't/data/40-templates-more.pl';
-+my $args = "--host $host $filename";
- test_once $args, qr/unknown error code - host $host unreachable?/, 'invalid host error', 22, 'error on invalid host';
-
- $ENV{MOJO_LOG_LEVEL} = 'fatal';
-@@ -71,19 +72,36 @@ test_once $args, $expected, 'Admin may load templates', 0, 'successfully loaded
- test_once $args, qr/group with existing name/, 'Duplicate job group', 255, 'failed on duplicate job group';
-
- my $fh;
--($fh, $filename) = tempfile(UNLINK => 1, SUFFIX => '.json');
--$args = "--host $host --apikey $apikey --apisecret $apisecret --json > $filename";
-+my $tempfilename;
-+($fh, $tempfilename) = tempfile(UNLINK => 1, SUFFIX => '.json');
-+$args = "--host $host --apikey $apikey --apisecret $apisecret --json > $tempfilename";
- $expected = qr/^$/;
- dump_templates $args, $expected, 'dumped fixtures';
- # Clear the data in relevant tables
- $schema->resultset($_)->delete for qw(Machines TestSuites Products JobTemplates JobGroups);
--$args = "--host $host --apikey $apikey --apisecret $apisecret $filename";
-+$args = "--host $host --apikey $apikey --apisecret $apisecret $tempfilename";
- $expected = qr/JobGroups.+=> \{ added => 3, of => 3 \}/;
- test_once $args, $expected, 're-imported fixtures';
- my ($rh, $reference) = tempfile(UNLINK => 1, SUFFIX => '.json');
- $args = "--host $host --apikey $apikey --apisecret $apisecret --json > $reference";
- $expected = qr/^$/;
- dump_templates $args, $expected, 're-dumped fixtures';
--is_deeply decode($filename), decode($reference), 'both dumps match';
-+is_deeply decode($tempfilename), decode($reference), 'both dumps match';
-+
-+# Clear the data in relevant tables again
-+$schema->resultset($_)->delete for qw(Machines TestSuites Products JobTemplates JobGroups);
-+# load the templates file with 2 machines
-+$args = "--host $host --apikey $apikey --apisecret $apisecret $morefilename";
-+$expected = qr/Machines.+=> \{ added => 2, of => 2 \}/;
-+test_once $args, $expected, 'imported MOAR fixtures';
-+# wipe jobgroups manually as --clean explicitly skips it
-+$schema->resultset("JobGroups")->delete;
-+# now load the templates file with only 1 machine, with --clean
-+$args = "--host $host --apikey $apikey --apisecret $apisecret --clean $filename";
-+$expected = qr/Machines.+=> \{ added => 1, of => 1 \}/;
-+test_once $args, $expected, 'imported original fixtures';
-+is $schema->resultset('Machines')->count, 1, "only one machine is loaded";
-+my $machine = $schema->resultset('Machines')->first;
-+is $machine->name, "32bit", "correct machine is loaded";
-
- done_testing;
-diff --git a/t/data/40-templates-more.pl b/t/data/40-templates-more.pl
-new file mode 100644
-index 000000000..79f5fbb1e
---- /dev/null
-+++ b/t/data/40-templates-more.pl
-@@ -0,0 +1,37 @@
-+{
-+ JobGroups => [
-+ {
-+ group_name => "openSUSE Leap 42.3 Updates",
-+ template => "scenarios: {}\nproducts: {}\n",
-+ },
-+ ],
-+ JobTemplates => [],
-+ Machines => [
-+ {
-+ backend => "qemu",
-+ name => "32bit",
-+ settings => [],
-+ },
-+ {
-+ backend => "qemu",
-+ name => "64bit",
-+ settings => [],
-+ },
-+ ],
-+ Products => [
-+ {
-+ arch => "x86_64",
-+ distri => "opensuse",
-+ flavor => "DVD",
-+ settings => [],
-+ version => 42.2,
-+ },
-+ ],
-+ TestSuites => [
-+ {
-+ name => "uefi",
-+ settings =>
-+ [{key => "DESKTOP", value => "kde"}, {key => "INSTALLONLY", value => 1}, {key => "UEFI", value => 1},],
-+ },
-+ ],
-+}
---
-2.26.1
-
diff --git a/0001-Fix-missing_assets-to-ignore-repos-not-hidden-assets.patch b/0001-Fix-missing_assets-to-ignore-repos-not-hidden-assets.patch
new file mode 100644
index 0000000..f27d9de
--- /dev/null
+++ b/0001-Fix-missing_assets-to-ignore-repos-not-hidden-assets.patch
@@ -0,0 +1,53 @@
+From 4a09dedd5f1a09b2f5df817a3c097a968f8e1b5a Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam(a)redhat.com>
+Date: Wed, 29 Apr 2020 12:50:35 -0700
+Subject: [PATCH] Fix missing_assets to ignore repos, not 'hidden assets'
+
+As discussed in
+https://github.com/os-autoinst/openQA/pull/2676#issuecomment-615951653
+and follow-ups, this check misunderstands the "hidden" attribute.
+The code assumes that "hidden" assets are the same thing as
+"assets we don't really want to copy down when cloning jobs",
+but they are not. The "hidden" attribute was written (by me) to
+mean "asset types not to be shown for downloading in the web UI".
+
+For SUSE, it happens to be the case that ["repo"] would be the
+right array of both "not-to-be-shown-in-the-web-ui assets" and
+"non-clonable assets", so this bug wasn't apparent, as SUSE
+deployments leave the `hide_asset_types` config setting at its
+default value of just 'repo'. But on Fedora deployments, this
+setting is changed to 'repo iso hdd' (because we don't want to
+show those asset types for download in the web UI), so this code
+also ignored ISO and HDD assets when checking for "missing"
+assets, which we don't want.
+
+As discussed in the pull request we could potentially make this
+a configurable attribute and have the clone_job script use it
+too, but doing that is a bit harder, and I don't think for now
+anyone wants a different definition of "non-clonable assets", so
+it doesn't seem really necessary.
+
+Signed-off-by: Adam Williamson <awilliam(a)redhat.com>
+---
+ lib/OpenQA/Schema/Result/Jobs.pm | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/lib/OpenQA/Schema/Result/Jobs.pm b/lib/OpenQA/Schema/Result/Jobs.pm
+index 8ae786659..5bbf0cb41 100644
+--- a/lib/OpenQA/Schema/Result/Jobs.pm
++++ b/lib/OpenQA/Schema/Result/Jobs.pm
+@@ -572,8 +572,10 @@ sub missing_assets {
+ delete $assets->{UEFI_PFLASH_VARS};
+
+ my $parent_job_ids = $self->_parent_job_ids;
++ # ignore repos, as they're not really clonable: see
++ # https://github.com/os-autoinst/openQA/pull/2676#issuecomment-616312026
+ my @relevant_assets
+- = grep { $_->{name} ne '' && !OpenQA::Schema::Result::Assets::is_type_hidden($_->{type}) } values %$assets;
++ = grep { $_->{name} ne '' && $_->{type} ne 'repo' } values %$assets;
+ my @assets_query = map {
+ {
+ type => $_->{type},
+--
+2.26.2
+
diff --git a/openqa.spec b/openqa.spec
index fc38091..4666a4b 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 7160d88d931d9706ba1e55d66fd9f0ea5d9377b0
+%global github_commit 46234f90c3852646b7f80b88dcb9d8e5dca07f10
# if set, will be a post-release snapshot build, otherwise a 'normal' build
-%global github_date 20200415
+%global github_date 20200429
%global shortcommit %(c=%{github_commit}; echo ${c:0:7})
# can't use linebreaks here!
@@ -39,34 +39,50 @@
%endif
%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(Archive::Extract) 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.24, perl(Try::Tiny) perl(Regexp::Common), perl(Storable)
+
+# 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.24 perl(Regexp::Common) perl(Storable) perl(Try::Tiny)
# 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(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::PP) perl(YAML::XS) >= 0.67, perl(LWP::UserAgent) perl(Getopt::Long::Descriptive) perl(Time::Seconds) perl(Time::Piece)
-%define client_requires curl jq git-core perl(IO::Socket::SSL) >= 2.009, perl(JSON::Validator) perl(LWP::UserAgent) perl(LWP::Protocol::https) perl(IPC::Run) perl(YAML::PP) >= 0.020 perl(YAML::XS)
-%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
+# 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)
+# The following line is generated from dependencies.yaml (upstream)
+%define client_requires curl git-core jq perl(IO::Socket::SSL) >= 2.009 perl(IPC::Run) perl(JSON::Validator) perl(LWP::Protocol::https) perl(LWP::UserAgent) 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)
+# The following line is generated from dependencies.yaml (upstream)
+%define build_requires %assetpack_requires rubygem(sass)
# All requirements needed by the tests executed during build-time.
# 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,
-# 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 curl jq
+# 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), Test::MockObject and Test::Exception added as
+# upstream is missing them - https://github.com/os-autoinst/openQA/pull/3018
+# 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::More) perl(Test::Output) perl(Test::Pod) perl(Test::Strict) perl(Test::Warnings) postgresql-server
+%ifarch x86_64
+%define qemu qemu qemu-kvm
+%else
+%define qemu qemu
+%endif
# 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)
+# The following line is generated from dependencies.yaml
+%define devel_requires %build_requires %qemu %test_requires curl perl(Devel::Cover) perl(Perl::Tidy) postgresql-devel rsync sudo tar
Name: openqa
Version: %{github_version}
-Release: 48%{?github_date:.%{github_date}git%{shortcommit}}%{?dist}
+Release: 49%{?github_date:.%{github_date}git%{shortcommit}}%{?dist}
Summary: OS-level automated testing framework
License: GPLv2+
Url: http://os-autoinst.github.io/openQA/
@@ -88,9 +104,11 @@ Source3: FedoraMessaging.pm
# tests for the fedora-messaging publishing plugin
Source4: 23-fedora-messaging.t
-# https://github.com/os-autoinst/openQA/pull/2955
-# Fix a logic error in `load_templates --clean` that breaks it
-Patch0: 0001-Fix-load_templates-clean-to-wipe-more-than-one-entry.patch
+# https://github.com/os-autoinst/openQA/pull/3017
+# Missing asset check shouldn't use 'hidden' attribute as it doesn't
+# mean what the author thought it meant, made the check ignore most
+# assets on Fedora
+Patch0: 0001-Fix-missing_assets-to-ignore-repos-not-hidden-assets.patch
BuildRequires: %{python_scripts_requires}
BuildRequires: perl-generators
@@ -305,6 +323,7 @@ ln -s %{_sysconfdir}/openqa/openqa.ini %{buildroot}%{_datadir}/openqa/etc/openqa
ln -s %{_sysconfdir}/openqa/database.ini %{buildroot}%{_datadir}/openqa/etc/openqa/database.ini
mkdir -p %{buildroot}%{_bindir}
ln -s %{_datadir}/openqa/script/client %{buildroot}%{_bindir}/openqa-client
+ln -s %{_datadir}/openqa/script/openqa-cli %{buildroot}%{_bindir}/openqa-cli
ln -s %{_datadir}/openqa/script/openqa-clone-job %{buildroot}%{_bindir}/openqa-clone-job
ln -s %{_datadir}/openqa/script/dump_templates %{buildroot}%{_bindir}/openqa-dump-templates
ln -s %{_datadir}/openqa/script/load_templates %{buildroot}%{_bindir}/openqa-load-templates
@@ -337,7 +356,10 @@ export LC_ALL=en_US.UTF-8
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 t/40-openqa-clone-job.t
+sed -i -e 's,unshare -r -n ,,g' t/40-script_openqa-clone-custom-git-refspec.t t/40-openqa-clone-job.t t/32-openqa_client-script.t
+# this test expects a 'not connected' error that it gets with unshare
+# 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
@@ -436,7 +458,6 @@ fi
%{_datadir}/openqa/dbicdh
%{_datadir}/openqa/assets
%dir %{_datadir}/openqa/script
-%{_datadir}/openqa/script/check_dependencies
%{_datadir}/openqa/script/create_admin
%{_datadir}/openqa/script/fetchneedles
%{_datadir}/openqa/script/initdb
@@ -541,6 +562,7 @@ fi
%{_datadir}/openqa/script/clone_job.pl
%{_datadir}/openqa/script/dump_templates
%{_datadir}/openqa/script/load_templates
+%{_datadir}/openqa/script/openqa-cli
%{_datadir}/openqa/script/openqa-clone-job
%{_datadir}/openqa/script/openqa-clone-custom-git-refspec
%{_datadir}/openqa/script/openqa-validate-yaml
@@ -550,6 +572,7 @@ fi
%{_datadir}/openqa/lib/OpenQA/Client
%{_datadir}/openqa/lib/OpenQA/UserAgent.pm
%{_bindir}/openqa-client
+%{_bindir}/openqa-cli
%{_bindir}/openqa-clone-job
%{_bindir}/openqa-dump-templates
%{_bindir}/openqa-load-templates
@@ -579,6 +602,11 @@ fi
%{_datadir}/openqa/lib/OpenQA/WebAPI/Plugin/FedoraUpdateRestart.pm
%changelog
+* Wed Apr 29 2020 Adam Williamson <awilliam(a)redhat.com> - 4.6-49.20200429git46234f9
+- Bump to latest git
+- Resync spec with upstream
+- Backport PR #3017: missing asset check shouldn't use 'hidden' asset attribute
+
* Sat Apr 18 2020 Adam Williamson <awilliam(a)redhat.com> - 4.6-48.20200415git7160d88
- Backport PR #2955 to fix broken load_templates --clean
diff --git a/sources b/sources
index 7806994..04f7ca5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (openQA-7160d88d931d9706ba1e55d66fd9f0ea5d9377b0.tar.gz) = 55c75bbf148b0cc1360f1ec5cd3d7eeb520d171b79a47c31b5e943495dd5607ed0b4d72f694933f435b8c026a11083ff2f6ec229d4f45db77be3aa197d014f6c
-SHA512 (assetcache-7160d88d931d9706ba1e55d66fd9f0ea5d9377b0.tar.xz) = 75711f1242f2bba05d3625f90c4403fd85e04265814b72e58db542875d5e4eecbd10a374f4d4f5f232ef05dec15ff7bd7436c132372119d49fed0a8e03bffda8
+SHA512 (openQA-46234f90c3852646b7f80b88dcb9d8e5dca07f10.tar.gz) = 8674b1555f070596d3dc5a55388a212758c89627c9d1f037ca9845705ec3d419209c378d5dba880fc2c184c9877c4cbc67fba2e468f3b8fbad93e0d45c9b2086
+SHA512 (assetcache-46234f90c3852646b7f80b88dcb9d8e5dca07f10.tar.xz) = 01d51e33c1eb59898fdc9b8e7dd52a11146a302af441b61512bafe03b4a80806d7224d22c663a1c9c2d13fd74f30430cb837de2584790dd12b5c9bf45a772503
3 years, 4 months
- 1
- 0
Architecture specific change in rpms/cjdns.git
by githook-noreply＠fedoraproject.org
The package rpms/cjdns.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/cjdns.git/commit/?id=4e0e75897d16....
Change:
+%ifarch armv7hl
Thanks.
Full change:
============
commit 4e0e75897d16a12bb04a5bb23f820299aea0b1da
Author: Stuart D. Gathman <stuart(a)gathman.org>
Date: Wed Apr 29 21:07:12 2020 -0400
Disable SECCOMP for armv7hl instead of using ExcludeArch
diff --git a/cjdns.spec b/cjdns.spec
index 33bceb7..df24d8f 100644
--- a/cjdns.spec
+++ b/cjdns.spec
@@ -14,7 +14,11 @@
%bcond_with libsodium
# Option to disable SECCOMP: confusing backward logic
# Needed to run on openvz and other container systems
+%ifarch armv7hl
+%bcond_with seccomp
+%else
%bcond_without seccomp
+%endif
# Option to use system libuv instead of bundled libuv-0.11.19
%bcond_with libuv
# When with_python3 is set, this replaces tools in bin and libexec
@@ -81,7 +85,7 @@
Name: cjdns
# major version is cjdns protocol version:
Version: 20.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The privacy-friendly network without borders
# cjdns is all GPLv3 except libuv which is MIT and BSD and ISC
# cnacl is unused except when use_embedded is true
@@ -193,7 +197,7 @@ Provides: bundled(nacl) = 20110221
# build system requires nodejs, unfortunately
ExclusiveArch: %{nodejs_arches}
# Seccomp_test is too slow on koji for this arch
-ExcludeArch: armv7hl
+#ExcludeArch: armv7hl
%description
Cjdns implements an encrypted IPv6 network using public-key cryptography for
@@ -332,7 +336,7 @@ fi
rm -rf node_build/dependencies/libuv
%else
rm -rf node_build/dependencies/libuv/build/gyp # use system gyp
-%ifarch s390x
+%ifarch armv7hl
sed -i -e '/optimizeLevel:/ s/-O0/-O3/' node_build/make.js
%else
sed -i -e '/optimizeLevel:/ s/-O0/-O3/' node_build/make.js
@@ -750,6 +754,9 @@ fi
%{_bindir}/graphStats
%changelog
+* Wed Apr 29 2020 Stuart Gathman <stuart(a)gathman.org> - 20.6-2
+- Disable SECCOMP by default for armv7hl instead of excluding arch
+
* Mon Mar 16 2020 Stuart Gathman <stuart(a)gathman.org> - 20.6-1
- New upstream release
3 years, 4 months
- 1
- 0
Architecture specific change in rpms/cjdns.git
by githook-noreply＠fedoraproject.org
The package rpms/cjdns.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/cjdns.git/commit/?id=4e0e75897d16....
Change:
+%ifarch armv7hl
Thanks.
Full change:
============
commit 4e0e75897d16a12bb04a5bb23f820299aea0b1da
Author: Stuart D. Gathman <stuart(a)gathman.org>
Date: Wed Apr 29 21:07:12 2020 -0400
Disable SECCOMP for armv7hl instead of using ExcludeArch
diff --git a/cjdns.spec b/cjdns.spec
index 33bceb7..df24d8f 100644
--- a/cjdns.spec
+++ b/cjdns.spec
@@ -14,7 +14,11 @@
%bcond_with libsodium
# Option to disable SECCOMP: confusing backward logic
# Needed to run on openvz and other container systems
+%ifarch armv7hl
+%bcond_with seccomp
+%else
%bcond_without seccomp
+%endif
# Option to use system libuv instead of bundled libuv-0.11.19
%bcond_with libuv
# When with_python3 is set, this replaces tools in bin and libexec
@@ -81,7 +85,7 @@
Name: cjdns
# major version is cjdns protocol version:
Version: 20.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The privacy-friendly network without borders
# cjdns is all GPLv3 except libuv which is MIT and BSD and ISC
# cnacl is unused except when use_embedded is true
@@ -193,7 +197,7 @@ Provides: bundled(nacl) = 20110221
# build system requires nodejs, unfortunately
ExclusiveArch: %{nodejs_arches}
# Seccomp_test is too slow on koji for this arch
-ExcludeArch: armv7hl
+#ExcludeArch: armv7hl
%description
Cjdns implements an encrypted IPv6 network using public-key cryptography for
@@ -332,7 +336,7 @@ fi
rm -rf node_build/dependencies/libuv
%else
rm -rf node_build/dependencies/libuv/build/gyp # use system gyp
-%ifarch s390x
+%ifarch armv7hl
sed -i -e '/optimizeLevel:/ s/-O0/-O3/' node_build/make.js
%else
sed -i -e '/optimizeLevel:/ s/-O0/-O3/' node_build/make.js
@@ -750,6 +754,9 @@ fi
%{_bindir}/graphStats
%changelog
+* Wed Apr 29 2020 Stuart Gathman <stuart(a)gathman.org> - 20.6-2
+- Disable SECCOMP by default for armv7hl instead of excluding arch
+
* Mon Mar 16 2020 Stuart Gathman <stuart(a)gathman.org> - 20.6-1
- New upstream release
3 years, 4 months
- 1
- 0
Architecture specific change in rpms/rust-vmw_backdoor.git
by githook-noreply＠fedoraproject.org
The package rpms/rust-vmw_backdoor.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-vmw_backdoor.git/commit/?id=....
Change:
+ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit 1ddcc33c35938adbe923a955166b2142af031bfe
Author: Robert Fairley <rfairley(a)redhat.com>
Date: Thu Apr 30 15:35:38 2020 +0000
Initial package
Signed-off-by: Robert Fairley <rfairley(a)redhat.com>
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9f21ef3
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/vmw_backdoor-0.1.2.crate
diff --git a/rust-vmw_backdoor.spec b/rust-vmw_backdoor.spec
new file mode 100644
index 0000000..7255d4c
--- /dev/null
+++ b/rust-vmw_backdoor.spec
@@ -0,0 +1,75 @@
+# Generated by rust2rpm 13
+%bcond_without check
+%global debug_package %{nil}
+
+%global crate vmw_backdoor
+
+Name: rust-%{crate}
+Version: 0.1.2
+Release: 1%{?dist}
+Summary: Pure-Rust library for VMware host-guest protocol ("VMXh backdoor")
+
+# Upstream license specification: MIT/Apache-2.0
+License: MIT or ASL 2.0
+URL: https://crates.io/crates/vmw_backdoor
+Source: %{crates_source}
+
+ExclusiveArch: %{rust_arches}
+%if %{__cargo_skip_build}
+BuildArch: noarch
+%endif
+
+BuildRequires: rust-packaging
+
+%global _description %{expand:
+Pure-Rust library for VMware host-guest protocol ("VMXh backdoor").}
+
+%description %{_description}
+
+%package devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description devel %{_description}
+
+This package contains library source intended for building other packages
+which use "%{crate}" crate.
+
+%files devel
+%{cargo_registry}/%{crate}-%{version_no_tilde}/
+%doc README.md
+%license COPYRIGHT LICENSE-APACHE-2.0 LICENSE-MIT
+
+%package -n %{name}+default-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+default-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "default" feature of "%{crate}" crate.
+
+%files -n %{name}+default-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%prep
+%autosetup -n %{crate}-%{version_no_tilde} -p1
+%cargo_prep
+
+%generate_buildrequires
+%cargo_generate_buildrequires
+
+%build
+%cargo_build
+
+%install
+%cargo_install
+
+%if %{with check}
+%check
+%cargo_test
+%endif
+
+%changelog
+* Sat Apr 25 15:45:50 UTC 2020 Robert Fairley <rfairley(a)redhat.com> - 0.1.2-1
+- Initial package
diff --git a/sources b/sources
new file mode 100644
index 0000000..c4de930
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (vmw_backdoor-0.1.2.crate) = 67bc4e9dab4e9db4f2c0e3ead4448d1ecbbdbcae383172c889059a3f8f1ad96c01b8e192f668ce81f38f11326f599313aeb2df711ebbd937d82fac8163a6fb6a
3 years, 5 months
- 1
- 0
Architecture specific change in rpms/sscg.git
by githook-noreply＠fedoraproject.org
The package rpms/sscg.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/sscg.git/commit/?id=a16d4e2460eb2....
Change:
-%ifnarch %{arm}
Thanks.
Full change:
============
commit a16d4e2460eb28cc6a47179ea021666f3ed2e919
Author: Stephen Gallagher <sgallagh(a)redhat.com>
Date: Thu Apr 30 11:02:14 2020 -0400
Don't bother running clang-format in the RPM build
Lengthen the test timeout so ARM tests pass
Signed-off-by: Stephen Gallagher <sgallagh(a)redhat.com>
diff --git a/0001-Make-clang-format-optional.patch b/0001-Make-clang-format-optional.patch
new file mode 100644
index 0000000..b778741
--- /dev/null
+++ b/0001-Make-clang-format-optional.patch
@@ -0,0 +1,47 @@
+From b850af14a6743d51b0b2df5e2414c6383c643f9d Mon Sep 17 00:00:00 2001
+From: Stephen Gallagher <sgallagh(a)redhat.com>
+Date: Thu, 30 Apr 2020 10:36:52 -0400
+Subject: [PATCH] Make clang-format optional
+
+Signed-off-by: Stephen Gallagher <sgallagh(a)redhat.com>
+---
+ meson.build | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 34392083f254b6851debfa77b807d88e85f22b8d..a57bfe8ff3484ad7a1c5941d5ac570ff0c559eab 100644
+--- a/meson.build
++++ b/meson.build
+@@ -5,11 +5,11 @@ project('sscg', 'c',
+ 'c_std=gnu99',
+ 'warning_level=1',
+ 'b_asneeded=true',
+ ],
+ license : 'MIT',
+- meson_version : '>=0.40.0')
++ meson_version : '>=0.44.0')
+
+ cc = meson.get_compiler('c')
+ test_cflags = [
+ '-Wpointer-arith',
+ '-Wmissing-declarations',
+@@ -108,11 +108,15 @@ sscg = executable(
+ include_directories : popt_incdirs,
+ install : true,
+ )
+
+ # Fake test to ensure that all sources and headers are formatted properly
+-test_clang_format = find_program('clang-format')
++test_clang_format = find_program('clang-format', required: false)
++if not test_clang_format.found()
++ test_clang_format = disabler()
++endif
++
+ clang_args = [ '-i' ]
+ test('test_clang_format', test_clang_format,
+ args : clang_args + files(sscg_lib_srcs + sscg_lib_hdrs + sscg_bin_srcs))
+
+ create_ca_test = executable(
+--
+2.26.2
+
diff --git a/sscg.spec b/sscg.spec
index 222fb24..8f0a7e6 100644
--- a/sscg.spec
+++ b/sscg.spec
@@ -9,7 +9,7 @@
Name: sscg
Version: 2.6.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Simple SSL certificate generator
License: BSD
@@ -24,8 +24,8 @@ BuildRequires: libpath_utils-devel
BuildRequires: meson
BuildRequires: ninja-build
BuildRequires: help2man
-BuildRequires: clang
+Patch0001: 0001-Make-clang-format-optional.patch
%description
@@ -48,10 +48,7 @@ false signatures from the service certificate.
%meson_install
%check
-
-%ifnarch %{arm}
-%meson_test
-%endif
+%meson_test -t 10
%files
%license COPYING
@@ -60,6 +57,10 @@ false signatures from the service certificate.
%{_mandir}/man8/%{name}.8*
%changelog
+* Thu Apr 30 2020 Stephen Gallagher <sgallagh(a)redhat.com> - 2.6.1-3
+- Don't bother running clang-format in the RPM build
+- Lengthen the test timeout so ARM tests pass
+
* Fri Jan 31 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.6.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
3 years, 5 months
- 1
- 0
Architecture specific change in rpms/community-mysql.git
by githook-noreply＠fedoraproject.org
The package rpms/community-mysql.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/community-mysql.git/commit/?id=4e....
Change:
+%ifarch s390x
Thanks.
Full change:
============
commit 7834706bc2b61a61611073010e213870dc32a345
Author: Lars Tangvald <lars.tangvald(a)oracle.com>
Date: Wed Apr 29 15:02:17 2020 +0200
Update to MySQL 8.0.20
diff --git a/community-mysql-2020.patch b/community-mysql-2020.patch
deleted file mode 100644
index 96f3819..0000000
--- a/community-mysql-2020.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-diff --git a/mysql-test/r/events_bugs.result b/mysql-test/r/events_bugs.result
-index 56821679efe..b05c76a7586 100644
---- a/mysql-test/r/events_bugs.result
-+++ b/mysql-test/r/events_bugs.result
-@@ -42,11 +42,11 @@ Warnings:
- Note 1588 Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was dropped immediately after creation.
- show events;
- Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation
--create event e_55 on schedule at 20200101000000 starts 10000101000000 do drop table t;
-+create event e_55 on schedule at 20380101000000 starts 10000101000000 do drop table t;
- ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'starts 10000101000000 do drop table t' at line 1
--create event e_55 on schedule at 20200101000000 ends 10000101000000 do drop table t;
-+create event e_55 on schedule at 20380101000000 ends 10000101000000 do drop table t;
- ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'ends 10000101000000 do drop table t' at line 1
--create event e_55 on schedule at 20200101000000 starts 10000101000000 ends 10000101000000 do drop table t;
-+create event e_55 on schedule at 20380101000000 starts 10000101000000 ends 10000101000000 do drop table t;
- ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'starts 10000101000000 ends 10000101000000 do drop table t' at line 1
- create event e_55 on schedule every 10 hour starts 10000101000000 do drop table t;
- ERROR HY000: Incorrect STARTS value: '10000101000000'
-@@ -411,16 +411,16 @@ SHOW EVENTS;
- Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation
- events_test e1 root@localhost +02:00 ONE TIME 2000-01-02 00:00:00 NULL NULL NULL NULL DISABLED 1 latin1 latin1_swedish_ci utf8mb4_0900_ai_ci
- SET TIME_ZONE= '-03:00';
--ALTER EVENT e1 ON SCHEDULE EVERY 1 DAY ENDS '2030-01-03 00:00:00'
-+ALTER EVENT e1 ON SCHEDULE EVERY 1 DAY ENDS '2038-01-03 00:00:00'
- ON COMPLETION PRESERVE DISABLE;
- SHOW EVENTS;
- Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation
--events_test e1 root@localhost -03:00 RECURRING NULL 1 DAY 2005-12-31 20:58:59 2030-01-03 00:00:00 DISABLED 1 latin1 latin1_swedish_ci utf8mb4_0900_ai_ci
-+events_test e1 root@localhost -03:00 RECURRING NULL 1 DAY 2005-12-31 20:58:59 2038-01-03 00:00:00 DISABLED 1 latin1 latin1_swedish_ci utf8mb4_0900_ai_ci
- SET TIME_ZONE= '+04:00';
- ALTER EVENT e1 DO SELECT 2;
- SHOW EVENTS;
- Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation
--events_test e1 root@localhost -03:00 RECURRING NULL 1 DAY 2005-12-31 20:58:59 2030-01-03 00:00:00 DISABLED 1 latin1 latin1_swedish_ci utf8mb4_0900_ai_ci
-+events_test e1 root@localhost -03:00 RECURRING NULL 1 DAY 2005-12-31 20:58:59 2038-01-03 00:00:00 DISABLED 1 latin1 latin1_swedish_ci utf8mb4_0900_ai_ci
- DROP EVENT e1;
- SET TIME_ZONE='+05:00';
- CREATE EVENT e1 ON SCHEDULE EVERY 1 DAY STARTS '2006-01-01 00:00:00' DO
-@@ -647,7 +647,7 @@ SET GLOBAL READ_ONLY = 1;
- # Connection: u1_con (mysqltest_u1@localhost/events_test).
- #
-
--CREATE EVENT e1 ON SCHEDULE AT '2020-01-01 00:00:00' DO SET @a = 1;
-+CREATE EVENT e1 ON SCHEDULE AT '2038-01-01 00:00:00' DO SET @a = 1;
- ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement
-
- ALTER EVENT e1 COMMENT 'comment';
-@@ -660,7 +660,7 @@ ERROR HY000: The MySQL server is running with the --read-only option so it canno
- # Connection: root_con (root@localhost/events_test).
- #
-
--CREATE EVENT e1 ON SCHEDULE AT '2020-01-01 00:00:00' DO SET @a = 1;
-+CREATE EVENT e1 ON SCHEDULE AT '2038-01-01 00:00:00' DO SET @a = 1;
-
- ALTER EVENT e1 COMMENT 'comment';
-
-diff --git a/mysql-test/t/events_bugs.test b/mysql-test/t/events_bugs.test
-index b35e8627852..8a4de2d4d55 100644
---- a/mysql-test/t/events_bugs.test
-+++ b/mysql-test/t/events_bugs.test
-@@ -216,11 +216,11 @@ create event e_55 on schedule at 20000101000000 do drop table t;
- show events;
-
- --error ER_PARSE_ERROR
--create event e_55 on schedule at 20200101000000 starts 10000101000000 do drop table t;
-+create event e_55 on schedule at 20380101000000 starts 10000101000000 do drop table t;
- --error ER_PARSE_ERROR
--create event e_55 on schedule at 20200101000000 ends 10000101000000 do drop table t;
-+create event e_55 on schedule at 20380101000000 ends 10000101000000 do drop table t;
- --error ER_PARSE_ERROR
--create event e_55 on schedule at 20200101000000 starts 10000101000000 ends 10000101000000 do drop table t;
-+create event e_55 on schedule at 20380101000000 starts 10000101000000 ends 10000101000000 do drop table t;
- --error ER_WRONG_VALUE
- create event e_55 on schedule every 10 hour starts 10000101000000 do drop table t;
-
-@@ -722,7 +722,7 @@ SHOW EVENTS;
-
- # This will update event time zone.
- SET TIME_ZONE= '-03:00';
--ALTER EVENT e1 ON SCHEDULE EVERY 1 DAY ENDS '2030-01-03 00:00:00'
-+ALTER EVENT e1 ON SCHEDULE EVERY 1 DAY ENDS '2038-01-03 00:00:00'
- ON COMPLETION PRESERVE DISABLE;
- SHOW EVENTS;
-
-@@ -1033,7 +1033,7 @@ SET GLOBAL READ_ONLY = 1;
- --echo
-
- --error ER_OPTION_PREVENTS_STATEMENT
--CREATE EVENT e1 ON SCHEDULE AT '2020-01-01 00:00:00' DO SET @a = 1;
-+CREATE EVENT e1 ON SCHEDULE AT '2038-01-01 00:00:00' DO SET @a = 1;
-
- --echo
-
-@@ -1057,7 +1057,7 @@ DROP EVENT e1;
-
- --echo
-
--CREATE EVENT e1 ON SCHEDULE AT '2020-01-01 00:00:00' DO SET @a = 1;
-+CREATE EVENT e1 ON SCHEDULE AT '2038-01-01 00:00:00' DO SET @a = 1;
-
- --echo
-
diff --git a/community-mysql.spec b/community-mysql.spec
index f58fd0a..edc5585 100644
--- a/community-mysql.spec
+++ b/community-mysql.spec
@@ -66,8 +66,8 @@
%global sameevr %{?epoch:%{epoch}:}%{version}-%{release}
Name: community-mysql
-Version: 8.0.19
-Release: 3%{?with_debug:.debug}%{?dist}
+Version: 8.0.20
+Release: 1%{?with_debug:.debug}%{?dist}
Summary: MySQL client programs and shared libraries
URL: http://www.mysql.com
@@ -105,7 +105,6 @@ Patch51: %{pkgnamepatch}-chain-certs.patch
Patch52: %{pkgnamepatch}-sharedir.patch
Patch55: %{pkgnamepatch}-rpath.patch
Patch75: %{pkgnamepatch}-arm32-timer.patch
-Patch76: %{pkgnamepatch}-2020.patch
# Patches taken from boost 1.59
Patch115: boost-1.58.0-pool.patch
@@ -374,7 +373,6 @@ the MySQL sources.
%patch52 -p1
%patch55 -p1
%patch75 -p1
-%patch76 -p1
# Patch Boost
pushd boost/boost_1_??_0
@@ -393,11 +391,8 @@ touch %{skiplist}
add_test innodb.redo_log_archive_04 failed since 8.0.17
add_test clone.remote_dml_no_binlog failed since 8.0.17
-add_test x.message_protobuf_nested due to protobuf 3.11
-add_test x.message_compressed_payload due to protobuf 3.11
add_test auth_sec.keyring_file_data_qa sporadic since 8.0.19
add_test collations.chinese sporadic since 8.0.19
-add_test main.events_1 everywhere always since F32 mass rebuild
# These tests fail on armv7hl; last check 8.0.16
%ifarch %arm aarch64
@@ -855,6 +850,9 @@ fi
%endif
%changelog
+* Sun Apr 26 2020 Lars Tangvald <lars.tangvald(a)oracle.com> - 8.0.20-1
+- Update to MySQL 8.0.20
+
* Wed Apr 01 2020 Jitka Plesnikova <jplesnik(a)redhat.com> - 8.0.19-3
- Specify all perl dependencies
diff --git a/sources b/sources
index 5111f6e..34d177d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mysql-boost-8.0.19.tar.gz) = 5ffc03f005ab2585694902e926b6cb2b10059b2b030549eccd3949f9c3b2f02626d02529f940dec003f2d69683856fd1c720ff12f89dfbdc48befaf24a9c4d01
+SHA512 (mysql-boost-8.0.20.tar.gz) = 7a962e9ddec7069008c5ab6ac2801515e2661ca2875afc6141541c03e2f941f4255b3c0d806a4df2fd2f2f1d12323aeb1e456c1d364777a18ccebefad7b22a99
commit 48992864ae73baf45a1a8d89a238545cb3668f65
Author: Jitka Plesnikova <jplesnik(a)redhat.com>
Date: Thu Apr 2 09:51:20 2020 +0200
Specify all perl dependencies
diff --git a/community-mysql.spec b/community-mysql.spec
index 5251b3d..f58fd0a 100644
--- a/community-mysql.spec
+++ b/community-mysql.spec
@@ -67,7 +67,7 @@
Name: community-mysql
Version: 8.0.19
-Release: 2%{?with_debug:.debug}%{?dist}
+Release: 3%{?with_debug:.debug}%{?dist}
Summary: MySQL client programs and shared libraries
URL: http://www.mysql.com
@@ -144,22 +144,43 @@ BuildRequires: multilib-rpm-config
# Tests requires time and ps and some perl modules
BuildRequires: procps
BuildRequires: time
+BuildRequires: perl(base)
+BuildRequires: perl(Carp)
+BuildRequires: perl(Cwd)
BuildRequires: perl(Digest::file)
BuildRequires: perl(Digest::MD5)
+BuildRequires: perl(English)
BuildRequires: perl(Env)
+BuildRequires: perl(Errno)
BuildRequires: perl(Exporter)
BuildRequires: perl(Fcntl)
+BuildRequires: perl(File::Basename)
+BuildRequires: perl(File::Copy)
+BuildRequires: perl(File::Find)
+BuildRequires: perl(File::Spec)
+BuildRequires: perl(File::Spec::Functions)
BuildRequires: perl(File::Temp)
BuildRequires: perl(Data::Dumper)
BuildRequires: perl(Getopt::Long)
+BuildRequires: perl(if)
+BuildRequires: perl(IO::File)
+BuildRequires: perl(IO::Handle)
+BuildRequires: perl(IO::Select)
+BuildRequires: perl(IO::Socket::INET)
BuildRequires: perl(IPC::Open3)
BuildRequires: perl(JSON)
+BuildRequires: perl(lib)
BuildRequires: perl(LWP::Simple)
BuildRequires: perl(Memoize)
+BuildRequires: perl(Net::Ping)
+BuildRequires: perl(POSIX)
BuildRequires: perl(Socket)
+BuildRequires: perl(strict)
BuildRequires: perl(Sys::Hostname)
BuildRequires: perl(Test::More)
BuildRequires: perl(Time::HiRes)
+BuildRequires: perl(Time::localtime)
+BuildRequires: perl(warnings)
BuildRequires: systemd
@@ -834,6 +855,9 @@ fi
%endif
%changelog
+* Wed Apr 01 2020 Jitka Plesnikova <jplesnik(a)redhat.com> - 8.0.19-3
+- Specify all perl dependencies
+
* Tue Jan 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 8.0.19-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
commit 4e311feff754cd6640e3f78617a63c23a6a084c5
Author: Michal Schorm <mschorm(a)redhat.com>
Date: Tue Feb 11 01:10:32 2020 +0100
Add failing tests list since F32 mass rebuild
diff --git a/community-mysql.spec b/community-mysql.spec
index 10538e5..5251b3d 100644
--- a/community-mysql.spec
+++ b/community-mysql.spec
@@ -393,6 +393,28 @@ add_test clone.remote_error_basic max_allowed_packet is 0
add_test innodb.create_tablespace
%endif
+%ifarch s390x
+# Fails since F32 Mass Rebuild
+add_test gis.geometry_class_attri_prop
+add_test gis.geometry_property_function_issimple
+add_test gis.gis_bugs_crashes
+add_test gis.spatial_analysis_functions_buffer
+add_test gis.spatial_analysis_functions_centroid
+add_test gis.spatial_analysis_functions_distance
+add_test gis.spatial_operators_intersection
+add_test gis.spatial_op_testingfunc_mix
+add_test gis.spatial_utility_function_distance_sphere
+add_test gis.spatial_utility_function_simplify
+add_test innodb.log_encrypt_kill main.with_recursive
+add_test innodb.mysqldump_max_recordsize
+add_test main.lock_multi_bug38499
+add_test main.window_std_var
+add_test main.window_std_var_optimized
+add_test main.with_recursive
+%endif
+
+
+
popd
cp %{SOURCE2} %{SOURCE3} %{SOURCE10} %{SOURCE11} %{SOURCE12} \
commit 1774cb35fa95cb26050b00f4298ccfb4a270faeb
Author: Michal Schorm <mschorm(a)redhat.com>
Date: Sat Feb 8 03:29:41 2020 +0100
Add failing test
diff --git a/community-mysql.spec b/community-mysql.spec
index a32092b..10538e5 100644
--- a/community-mysql.spec
+++ b/community-mysql.spec
@@ -376,6 +376,7 @@ add_test x.message_protobuf_nested due to protobuf 3.11
add_test x.message_compressed_payload due to protobuf 3.11
add_test auth_sec.keyring_file_data_qa sporadic since 8.0.19
add_test collations.chinese sporadic since 8.0.19
+add_test main.events_1 everywhere always since F32 mass rebuild
# These tests fail on armv7hl; last check 8.0.16
%ifarch %arm aarch64
commit b8d09ead424cb201f3176397e25aba9d44a6ba4c
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Tue Jan 28 14:35:00 2020 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/community-mysql.spec b/community-mysql.spec
index 1bfdbac..a32092b 100644
--- a/community-mysql.spec
+++ b/community-mysql.spec
@@ -67,7 +67,7 @@
Name: community-mysql
Version: 8.0.19
-Release: 1%{?with_debug:.debug}%{?dist}
+Release: 2%{?with_debug:.debug}%{?dist}
Summary: MySQL client programs and shared libraries
URL: http://www.mysql.com
@@ -811,6 +811,9 @@ fi
%endif
%changelog
+* Tue Jan 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 8.0.19-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
* Thu Jan 02 2020 Lars Tangvald <lars.tangvald(a)oracle.com> - 8.0.19-1
- Update to MySQL 8.0.19
3 years, 5 months
- 1
- 0
Architecture specific change in rpms/community-mysql.git
by githook-noreply＠fedoraproject.org
The package rpms/community-mysql.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/community-mysql.git/commit/?id=4e....
Change:
+%ifarch s390x
Thanks.
Full change:
============
commit 7834706bc2b61a61611073010e213870dc32a345
Author: Lars Tangvald <lars.tangvald(a)oracle.com>
Date: Wed Apr 29 15:02:17 2020 +0200
Update to MySQL 8.0.20
diff --git a/community-mysql-2020.patch b/community-mysql-2020.patch
deleted file mode 100644
index 96f3819..0000000
--- a/community-mysql-2020.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-diff --git a/mysql-test/r/events_bugs.result b/mysql-test/r/events_bugs.result
-index 56821679efe..b05c76a7586 100644
---- a/mysql-test/r/events_bugs.result
-+++ b/mysql-test/r/events_bugs.result
-@@ -42,11 +42,11 @@ Warnings:
- Note 1588 Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was dropped immediately after creation.
- show events;
- Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation
--create event e_55 on schedule at 20200101000000 starts 10000101000000 do drop table t;
-+create event e_55 on schedule at 20380101000000 starts 10000101000000 do drop table t;
- ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'starts 10000101000000 do drop table t' at line 1
--create event e_55 on schedule at 20200101000000 ends 10000101000000 do drop table t;
-+create event e_55 on schedule at 20380101000000 ends 10000101000000 do drop table t;
- ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'ends 10000101000000 do drop table t' at line 1
--create event e_55 on schedule at 20200101000000 starts 10000101000000 ends 10000101000000 do drop table t;
-+create event e_55 on schedule at 20380101000000 starts 10000101000000 ends 10000101000000 do drop table t;
- ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'starts 10000101000000 ends 10000101000000 do drop table t' at line 1
- create event e_55 on schedule every 10 hour starts 10000101000000 do drop table t;
- ERROR HY000: Incorrect STARTS value: '10000101000000'
-@@ -411,16 +411,16 @@ SHOW EVENTS;
- Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation
- events_test e1 root@localhost +02:00 ONE TIME 2000-01-02 00:00:00 NULL NULL NULL NULL DISABLED 1 latin1 latin1_swedish_ci utf8mb4_0900_ai_ci
- SET TIME_ZONE= '-03:00';
--ALTER EVENT e1 ON SCHEDULE EVERY 1 DAY ENDS '2030-01-03 00:00:00'
-+ALTER EVENT e1 ON SCHEDULE EVERY 1 DAY ENDS '2038-01-03 00:00:00'
- ON COMPLETION PRESERVE DISABLE;
- SHOW EVENTS;
- Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation
--events_test e1 root@localhost -03:00 RECURRING NULL 1 DAY 2005-12-31 20:58:59 2030-01-03 00:00:00 DISABLED 1 latin1 latin1_swedish_ci utf8mb4_0900_ai_ci
-+events_test e1 root@localhost -03:00 RECURRING NULL 1 DAY 2005-12-31 20:58:59 2038-01-03 00:00:00 DISABLED 1 latin1 latin1_swedish_ci utf8mb4_0900_ai_ci
- SET TIME_ZONE= '+04:00';
- ALTER EVENT e1 DO SELECT 2;
- SHOW EVENTS;
- Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation
--events_test e1 root@localhost -03:00 RECURRING NULL 1 DAY 2005-12-31 20:58:59 2030-01-03 00:00:00 DISABLED 1 latin1 latin1_swedish_ci utf8mb4_0900_ai_ci
-+events_test e1 root@localhost -03:00 RECURRING NULL 1 DAY 2005-12-31 20:58:59 2038-01-03 00:00:00 DISABLED 1 latin1 latin1_swedish_ci utf8mb4_0900_ai_ci
- DROP EVENT e1;
- SET TIME_ZONE='+05:00';
- CREATE EVENT e1 ON SCHEDULE EVERY 1 DAY STARTS '2006-01-01 00:00:00' DO
-@@ -647,7 +647,7 @@ SET GLOBAL READ_ONLY = 1;
- # Connection: u1_con (mysqltest_u1@localhost/events_test).
- #
-
--CREATE EVENT e1 ON SCHEDULE AT '2020-01-01 00:00:00' DO SET @a = 1;
-+CREATE EVENT e1 ON SCHEDULE AT '2038-01-01 00:00:00' DO SET @a = 1;
- ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement
-
- ALTER EVENT e1 COMMENT 'comment';
-@@ -660,7 +660,7 @@ ERROR HY000: The MySQL server is running with the --read-only option so it canno
- # Connection: root_con (root@localhost/events_test).
- #
-
--CREATE EVENT e1 ON SCHEDULE AT '2020-01-01 00:00:00' DO SET @a = 1;
-+CREATE EVENT e1 ON SCHEDULE AT '2038-01-01 00:00:00' DO SET @a = 1;
-
- ALTER EVENT e1 COMMENT 'comment';
-
-diff --git a/mysql-test/t/events_bugs.test b/mysql-test/t/events_bugs.test
-index b35e8627852..8a4de2d4d55 100644
---- a/mysql-test/t/events_bugs.test
-+++ b/mysql-test/t/events_bugs.test
-@@ -216,11 +216,11 @@ create event e_55 on schedule at 20000101000000 do drop table t;
- show events;
-
- --error ER_PARSE_ERROR
--create event e_55 on schedule at 20200101000000 starts 10000101000000 do drop table t;
-+create event e_55 on schedule at 20380101000000 starts 10000101000000 do drop table t;
- --error ER_PARSE_ERROR
--create event e_55 on schedule at 20200101000000 ends 10000101000000 do drop table t;
-+create event e_55 on schedule at 20380101000000 ends 10000101000000 do drop table t;
- --error ER_PARSE_ERROR
--create event e_55 on schedule at 20200101000000 starts 10000101000000 ends 10000101000000 do drop table t;
-+create event e_55 on schedule at 20380101000000 starts 10000101000000 ends 10000101000000 do drop table t;
- --error ER_WRONG_VALUE
- create event e_55 on schedule every 10 hour starts 10000101000000 do drop table t;
-
-@@ -722,7 +722,7 @@ SHOW EVENTS;
-
- # This will update event time zone.
- SET TIME_ZONE= '-03:00';
--ALTER EVENT e1 ON SCHEDULE EVERY 1 DAY ENDS '2030-01-03 00:00:00'
-+ALTER EVENT e1 ON SCHEDULE EVERY 1 DAY ENDS '2038-01-03 00:00:00'
- ON COMPLETION PRESERVE DISABLE;
- SHOW EVENTS;
-
-@@ -1033,7 +1033,7 @@ SET GLOBAL READ_ONLY = 1;
- --echo
-
- --error ER_OPTION_PREVENTS_STATEMENT
--CREATE EVENT e1 ON SCHEDULE AT '2020-01-01 00:00:00' DO SET @a = 1;
-+CREATE EVENT e1 ON SCHEDULE AT '2038-01-01 00:00:00' DO SET @a = 1;
-
- --echo
-
-@@ -1057,7 +1057,7 @@ DROP EVENT e1;
-
- --echo
-
--CREATE EVENT e1 ON SCHEDULE AT '2020-01-01 00:00:00' DO SET @a = 1;
-+CREATE EVENT e1 ON SCHEDULE AT '2038-01-01 00:00:00' DO SET @a = 1;
-
- --echo
-
diff --git a/community-mysql.spec b/community-mysql.spec
index f58fd0a..edc5585 100644
--- a/community-mysql.spec
+++ b/community-mysql.spec
@@ -66,8 +66,8 @@
%global sameevr %{?epoch:%{epoch}:}%{version}-%{release}
Name: community-mysql
-Version: 8.0.19
-Release: 3%{?with_debug:.debug}%{?dist}
+Version: 8.0.20
+Release: 1%{?with_debug:.debug}%{?dist}
Summary: MySQL client programs and shared libraries
URL: http://www.mysql.com
@@ -105,7 +105,6 @@ Patch51: %{pkgnamepatch}-chain-certs.patch
Patch52: %{pkgnamepatch}-sharedir.patch
Patch55: %{pkgnamepatch}-rpath.patch
Patch75: %{pkgnamepatch}-arm32-timer.patch
-Patch76: %{pkgnamepatch}-2020.patch
# Patches taken from boost 1.59
Patch115: boost-1.58.0-pool.patch
@@ -374,7 +373,6 @@ the MySQL sources.
%patch52 -p1
%patch55 -p1
%patch75 -p1
-%patch76 -p1
# Patch Boost
pushd boost/boost_1_??_0
@@ -393,11 +391,8 @@ touch %{skiplist}
add_test innodb.redo_log_archive_04 failed since 8.0.17
add_test clone.remote_dml_no_binlog failed since 8.0.17
-add_test x.message_protobuf_nested due to protobuf 3.11
-add_test x.message_compressed_payload due to protobuf 3.11
add_test auth_sec.keyring_file_data_qa sporadic since 8.0.19
add_test collations.chinese sporadic since 8.0.19
-add_test main.events_1 everywhere always since F32 mass rebuild
# These tests fail on armv7hl; last check 8.0.16
%ifarch %arm aarch64
@@ -855,6 +850,9 @@ fi
%endif
%changelog
+* Sun Apr 26 2020 Lars Tangvald <lars.tangvald(a)oracle.com> - 8.0.20-1
+- Update to MySQL 8.0.20
+
* Wed Apr 01 2020 Jitka Plesnikova <jplesnik(a)redhat.com> - 8.0.19-3
- Specify all perl dependencies
diff --git a/sources b/sources
index 5111f6e..34d177d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mysql-boost-8.0.19.tar.gz) = 5ffc03f005ab2585694902e926b6cb2b10059b2b030549eccd3949f9c3b2f02626d02529f940dec003f2d69683856fd1c720ff12f89dfbdc48befaf24a9c4d01
+SHA512 (mysql-boost-8.0.20.tar.gz) = 7a962e9ddec7069008c5ab6ac2801515e2661ca2875afc6141541c03e2f941f4255b3c0d806a4df2fd2f2f1d12323aeb1e456c1d364777a18ccebefad7b22a99
commit 48992864ae73baf45a1a8d89a238545cb3668f65
Author: Jitka Plesnikova <jplesnik(a)redhat.com>
Date: Thu Apr 2 09:51:20 2020 +0200
Specify all perl dependencies
diff --git a/community-mysql.spec b/community-mysql.spec
index 5251b3d..f58fd0a 100644
--- a/community-mysql.spec
+++ b/community-mysql.spec
@@ -67,7 +67,7 @@
Name: community-mysql
Version: 8.0.19
-Release: 2%{?with_debug:.debug}%{?dist}
+Release: 3%{?with_debug:.debug}%{?dist}
Summary: MySQL client programs and shared libraries
URL: http://www.mysql.com
@@ -144,22 +144,43 @@ BuildRequires: multilib-rpm-config
# Tests requires time and ps and some perl modules
BuildRequires: procps
BuildRequires: time
+BuildRequires: perl(base)
+BuildRequires: perl(Carp)
+BuildRequires: perl(Cwd)
BuildRequires: perl(Digest::file)
BuildRequires: perl(Digest::MD5)
+BuildRequires: perl(English)
BuildRequires: perl(Env)
+BuildRequires: perl(Errno)
BuildRequires: perl(Exporter)
BuildRequires: perl(Fcntl)
+BuildRequires: perl(File::Basename)
+BuildRequires: perl(File::Copy)
+BuildRequires: perl(File::Find)
+BuildRequires: perl(File::Spec)
+BuildRequires: perl(File::Spec::Functions)
BuildRequires: perl(File::Temp)
BuildRequires: perl(Data::Dumper)
BuildRequires: perl(Getopt::Long)
+BuildRequires: perl(if)
+BuildRequires: perl(IO::File)
+BuildRequires: perl(IO::Handle)
+BuildRequires: perl(IO::Select)
+BuildRequires: perl(IO::Socket::INET)
BuildRequires: perl(IPC::Open3)
BuildRequires: perl(JSON)
+BuildRequires: perl(lib)
BuildRequires: perl(LWP::Simple)
BuildRequires: perl(Memoize)
+BuildRequires: perl(Net::Ping)
+BuildRequires: perl(POSIX)
BuildRequires: perl(Socket)
+BuildRequires: perl(strict)
BuildRequires: perl(Sys::Hostname)
BuildRequires: perl(Test::More)
BuildRequires: perl(Time::HiRes)
+BuildRequires: perl(Time::localtime)
+BuildRequires: perl(warnings)
BuildRequires: systemd
@@ -834,6 +855,9 @@ fi
%endif
%changelog
+* Wed Apr 01 2020 Jitka Plesnikova <jplesnik(a)redhat.com> - 8.0.19-3
+- Specify all perl dependencies
+
* Tue Jan 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 8.0.19-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
commit 4e311feff754cd6640e3f78617a63c23a6a084c5
Author: Michal Schorm <mschorm(a)redhat.com>
Date: Tue Feb 11 01:10:32 2020 +0100
Add failing tests list since F32 mass rebuild
diff --git a/community-mysql.spec b/community-mysql.spec
index 10538e5..5251b3d 100644
--- a/community-mysql.spec
+++ b/community-mysql.spec
@@ -393,6 +393,28 @@ add_test clone.remote_error_basic max_allowed_packet is 0
add_test innodb.create_tablespace
%endif
+%ifarch s390x
+# Fails since F32 Mass Rebuild
+add_test gis.geometry_class_attri_prop
+add_test gis.geometry_property_function_issimple
+add_test gis.gis_bugs_crashes
+add_test gis.spatial_analysis_functions_buffer
+add_test gis.spatial_analysis_functions_centroid
+add_test gis.spatial_analysis_functions_distance
+add_test gis.spatial_operators_intersection
+add_test gis.spatial_op_testingfunc_mix
+add_test gis.spatial_utility_function_distance_sphere
+add_test gis.spatial_utility_function_simplify
+add_test innodb.log_encrypt_kill main.with_recursive
+add_test innodb.mysqldump_max_recordsize
+add_test main.lock_multi_bug38499
+add_test main.window_std_var
+add_test main.window_std_var_optimized
+add_test main.with_recursive
+%endif
+
+
+
popd
cp %{SOURCE2} %{SOURCE3} %{SOURCE10} %{SOURCE11} %{SOURCE12} \
commit 1774cb35fa95cb26050b00f4298ccfb4a270faeb
Author: Michal Schorm <mschorm(a)redhat.com>
Date: Sat Feb 8 03:29:41 2020 +0100
Add failing test
diff --git a/community-mysql.spec b/community-mysql.spec
index a32092b..10538e5 100644
--- a/community-mysql.spec
+++ b/community-mysql.spec
@@ -376,6 +376,7 @@ add_test x.message_protobuf_nested due to protobuf 3.11
add_test x.message_compressed_payload due to protobuf 3.11
add_test auth_sec.keyring_file_data_qa sporadic since 8.0.19
add_test collations.chinese sporadic since 8.0.19
+add_test main.events_1 everywhere always since F32 mass rebuild
# These tests fail on armv7hl; last check 8.0.16
%ifarch %arm aarch64
commit b8d09ead424cb201f3176397e25aba9d44a6ba4c
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Tue Jan 28 14:35:00 2020 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/community-mysql.spec b/community-mysql.spec
index 1bfdbac..a32092b 100644
--- a/community-mysql.spec
+++ b/community-mysql.spec
@@ -67,7 +67,7 @@
Name: community-mysql
Version: 8.0.19
-Release: 1%{?with_debug:.debug}%{?dist}
+Release: 2%{?with_debug:.debug}%{?dist}
Summary: MySQL client programs and shared libraries
URL: http://www.mysql.com
@@ -811,6 +811,9 @@ fi
%endif
%changelog
+* Tue Jan 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 8.0.19-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
* Thu Jan 02 2020 Lars Tangvald <lars.tangvald(a)oracle.com> - 8.0.19-1
- Update to MySQL 8.0.19
3 years, 5 months
- 1
- 0
Architecture specific change in rpms/lua-luv.git
by githook-noreply＠fedoraproject.org
The package rpms/lua-luv.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/lua-luv.git/commit/?id=d5fd0c8eb8....
Change:
+ExcludeArch: s390x
Thanks.
Full change:
============
commit d5fd0c8eb8f0b7cc5dff0244d797d1b1eb2b4268
Author: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Tue Apr 28 19:46:11 2020 -0700
Update to 1.36.0-0, and support building on EPEL 8
Upstream's 1.36.0-0 release has fixes that make it backward-compatible with all versions of libuv down to 1.0.0, which makes it easier to support releases with older libuv (e.g. RHEL/CentOS 8).
Also, RHEL 8 ships libuv in AppStream but omits the -devel subpackage, which is thus shipped in CentOS's extra Devel repo -- but that is not available on s390x. Add an ExcludeArch (with appropriate blocking bug filed) to indicate this.
diff --git a/.gitignore b/.gitignore
index 3d1d0e5..18a8ad4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/luv-1.32.0.0.tar.gz
/luv-1.34.1.1.tar.gz
/luv-1.34.2.1.tar.gz
+/luv-1.36.0.0.tar.gz
diff --git a/lua-luv.spec b/lua-luv.spec
index 792f0de..31b59ec 100644
--- a/lua-luv.spec
+++ b/lua-luv.spec
@@ -10,8 +10,8 @@
%global lua_51_pkgdir %{_datadir}/lua/%{lua_51_version}
%global lua_51_builddir obj-lua51
-%global real_version 1.34.2
-%global extra_version 1
+%global real_version 1.36.0
+%global extra_version 0
BuildRequires: cmake
BuildRequires: gcc
@@ -34,6 +34,14 @@ Requires: lua(abi) = %{lua_53_version}
Source0: https://github.com/luvit/luv/archive/%{real_version}-%{extra_version}/luv...
+%if 0%{?el8}
+# libuv-devel is from the CentOS Devel repo, only available on
+# aarch64, ppc64le, and x86_64:
+# https://mirrors.edge.kernel.org/centos/8-stream/Devel/
+# bz# 1829151
+ExcludeArch: s390x
+%endif
+
%description
This library makes libuv available to lua scripts. It was made
for the luvit project but should usable from nearly any lua
@@ -173,8 +181,12 @@ rm luv.so
%{lua_51_incdir}/luv/util.h
%changelog
+* Tue Apr 28 2020 Michel Alexandre Salim <salimma(a)fedoraproject.org> - 1.36.0.0-1
+- Update to version 1.36.0-0
+- Support building on EPEL 8
+
* Sat Feb 29 2020 Andreas Schneider <asn(a)redhat.com> - 1.34.2.1-1
-* Update to version 1.34.2-1
+- Update to version 1.34.2-1
- https://github.com/luvit/luv/releases/tag/1.34.2-0
- https://github.com/luvit/luv/releases/tag/1.34.2-1
diff --git a/sources b/sources
index a5118ba..799f303 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (luv-1.34.2.1.tar.gz) = 9eed3988757905a862a83ee043a15be93c31bb4822535012ec367ee97bc411c1e14e94c22278bbac49b24ad372b14b68cc5af53f98e4474a384140b649f20ee4
+SHA512 (luv-1.36.0.0.tar.gz) = 3119c1450a8317725d59cc1ab6afccfbde752b0c32b38909dfdd31bf88ea0751920dc68750da52cf17a6430637cf1094f4d5500e4c50d1145eca48bb12728ba1
3 years, 5 months
- 1
- 0