diff --git a/.gitignore b/.gitignore index 450b363..c17cf93 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ /os-autoinst-50464d4e81fcac9dd36785ba88f69b489e4e99e7.tar.gz /os-autoinst-85fa4f12c1fb5bed7295791801085d32a69d4586.tar.gz /os-autoinst-bcbc6c412cbd69ab461d5448f8bf08b5371a0adb.tar.gz +/os-autoinst-f38e8b174dc1a0cace4d624a197a297f9efdc2bb.tar.gz diff --git a/os-autoinst.spec b/os-autoinst.spec index 3927ad9..49a1264 100644 --- a/os-autoinst.spec +++ b/os-autoinst.spec @@ -31,14 +31,14 @@ %global github_owner os-autoinst %global github_name os-autoinst %global github_version 4.6 -%global github_commit bcbc6c412cbd69ab461d5448f8bf08b5371a0adb +%global github_commit f38e8b174dc1a0cace4d624a197a297f9efdc2bb # if set, will be a post-release snapshot build, otherwise a 'normal' build -%global github_date 20200608 +%global github_date 20200610 %global shortcommit %(c=%{github_commit}; echo ${c:0:7}) Name: os-autoinst Version: %{github_version} -Release: 15%{?github_date:.%{github_date}git%{shortcommit}}%{?dist} +Release: 16%{?github_date:.%{github_date}git%{shortcommit}}%{?dist} Summary: OS-level test automation License: GPLv2+ URL: https://os-autoinst.github.io/openQA/ @@ -48,45 +48,27 @@ Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{gith # still use a macro just to keep build_requires similar for ease of # cross-comparison %define opencv_require pkgconfig(opencv) -# this is stuff we added to build_requires, we put it in its own macro -# to make resyncing with upstream spec changes easier. Upstream put -# MakeMaker in main_requires for some reason but it is clearly a build -# requirement: -# https://github.com/os-autoinst/os-autoinst/pull/1435 -# Pod::Html is needed to run pod2html as part of doc build, it used to -# be pulled in as a dep of Perl::Tidy but that's not explicitly listed -# in test_requires any more: -# https://github.com/os-autoinst/os-autoinst/pull/1437 -%define build_requires_additional perl(ExtUtils::MakeMaker) >= 7.12 perl(Pod::Html) -# diff from SUSE: added build_requires_additional # The following line is generated from dependencies.yaml (upstream) -%define build_requires %build_requires_additional %opencv_require autoconf automake gcc-c++ libtool make perl(ExtUtils::Embed) perl(Module::CPANfile) pkg-config pkgconfig(fftw3) pkgconfig(libpng) pkgconfig(sndfile) pkgconfig(theoraenc) +%define build_requires %opencv_require autoconf automake gcc-c++ libtool make perl(ExtUtils::Embed) perl(ExtUtils::MakeMaker) >= 7.12 perl(Module::CPANfile) perl(Pod::Html) pkg-config pkgconfig(fftw3) pkgconfig(libpng) pkgconfig(sndfile) pkgconfig(theoraenc) # this is stuff we added to requires, we put it in its own macro # to make resyncing with upstream spec changes easier. SUSE has # perl-base, we have perl(base) %define main_requires_additional perl(base) # diff from SUSE: added main_requires_additional, dropped perl-base # which does not exist in Fedora - we have perl(base) in -# main_requires_additional and the perl(:MODULE_COMPAT) require below, -# dropped perl(ExtUtils::MakeMaker) which should be in build_requires +# main_requires_additional and the perl(:MODULE_COMPAT) require below # The following line is generated from dependencies.yaml (upstream) -%define main_requires %main_requires_additional perl(B::Deparse) perl(Carp) perl(Carp::Always) perl(Class::Accessor::Fast) perl(Config) perl(Cpanel::JSON::XS) perl(Crypt::DES) perl(Cwd) perl(Data::Dumper) perl(Digest::MD5) perl(DynaLoader) perl(English) perl(Errno) perl(Exception::Class) perl(Exporter) perl(ExtUtils::testlib) perl(Fcntl) perl(File::Basename) perl(File::Find) perl(File::Path) perl(File::Spec) perl(File::Temp) perl(File::Touch) perl(File::Which) perl(IO::Handle) perl(IO::Scalar) perl(IO::Select) perl(IO::Socket) perl(IO::Socket::INET) perl(IO::Socket::UNIX) perl(IPC::Open3) perl(IPC::Run::Debug) perl(IPC::System::Simple) perl(List::MoreUtils) perl(List::Util) perl(Mojo::IOLoop::ReadWriteProcess) >= 0.23 perl(Mojo::JSON) perl(Mojo::Log) perl(Mojo::URL) perl(Mojo::UserAgent) perl(Mojolicious) >= 8.42 perl(Mojolicious::Lite) perl(Net::DBus) perl(Net::IP) perl(Net::SNMP) perl(Net::SSH2) perl(POSIX) perl(Scalar::Util) perl(Socket) perl(Socket::MsgHdr) perl(Term::ANSIColor) perl(Thread::Queue) perl(Time::HiRes) perl(Try::Tiny) perl(XML::LibXML) perl(XML::SemanticDiff) perl(autodie) perl(base) perl(constant) perl(integer) perl(strict) perl(warnings) -%define requires_not_needed_in_tests git-core -# this is stuff we added to test_requires, we put it in its own macro -# to make resyncing with upstream spec changes easier. Since 7add21687 -# it seems tests fail unless git is installed: -# https://github.com/os-autoinst/os-autoinst/pull/1436 -%define test_requires_additional git-core +%define main_requires %main_requires_additional git-core perl(B::Deparse) perl(Carp) perl(Carp::Always) perl(Class::Accessor::Fast) perl(Config) perl(Cpanel::JSON::XS) perl(Crypt::DES) perl(Cwd) perl(Data::Dumper) perl(Digest::MD5) perl(DynaLoader) perl(English) perl(Errno) perl(Exception::Class) perl(Exporter) perl(ExtUtils::testlib) perl(Fcntl) perl(File::Basename) perl(File::Find) perl(File::Path) perl(File::Spec) perl(File::Temp) perl(File::Touch) perl(File::Which) perl(IO::Handle) perl(IO::Scalar) perl(IO::Select) perl(IO::Socket) perl(IO::Socket::INET) perl(IO::Socket::UNIX) perl(IPC::Open3) perl(IPC::Run::Debug) perl(IPC::System::Simple) perl(List::MoreUtils) perl(List::Util) perl(Mojo::IOLoop::ReadWriteProcess) >= 0.23 perl(Mojo::JSON) perl(Mojo::Log) perl(Mojo::URL) perl(Mojo::UserAgent) perl(Mojolicious) >= 8.42 perl(Mojolicious::Lite) perl(Net::DBus) perl(Net::IP) perl(Net::SNMP) perl(Net::SSH2) perl(POSIX) perl(Scalar::Util) perl(Socket) perl(Socket::MsgHdr) perl(Term::ANSIColor) perl(Thread::Queue) perl(Time::HiRes) perl(Try::Tiny) perl(XML::LibXML) perl(XML::SemanticDiff) perl(autodie) perl(base) perl(constant) perl(integer) perl(strict) perl(warnings) # all requirements needed by the tests, do not require on this in the package # itself or any sub-packages -# diff from SUSE: added test_requires_additional, replaced qemu-tools -# with qemu-img, replaced qemu-x86 with qemu-system-i386, dropped spell -# check requirement stuff as this isn't needed in package builds IMO, -# dropped critic stuff as we don't run those tests in our build -# The following line is generated from dependencies.yaml -%define test_requires %test_requires_additional %build_requires %main_requires perl(Benchmark) perl(Devel::Cover) perl(FindBin) perl(Pod::Coverage) perl(Test::Exception) perl(Test::Fatal) perl(Test::Mock::Time) perl(Test::MockModule) perl(Test::MockObject) perl(Test::Mojo) perl(Test::More) perl(Test::Output) perl(Test::Pod) perl(Test::Strict) perl(Test::Warnings) >= 0.029 perl(YAML::PP) qemu-kvm /usr/bin/qemu-img /usr/bin/qemu-system-i386 -# The following line is generated from dependencies.yaml -%define devel_requires %requires_not_needed_in_tests %test_requires perl(Devel::Cover) perl(Devel::Cover::Report::Codecov) perl(Perl::Tidy) +# diff from SUSE: replaced qemu-tools with qemu-img, replaced qemu-x86 +# with qemu-system-i386, dropped spellcheck requirement stuff as this +# isn't needed in package builds IMO, dropped critic stuff as we don't +# run those tests in our build +# The following line is generated from dependencies.yaml (upstream) +%define test_requires %build_requires %main_requires perl(Benchmark) perl(Devel::Cover) perl(FindBin) perl(Pod::Coverage) perl(Test::Exception) perl(Test::Fatal) perl(Test::Mock::Time) perl(Test::MockModule) perl(Test::MockObject) perl(Test::Mojo) perl(Test::More) perl(Test::Output) perl(Test::Pod) perl(Test::Strict) perl(Test::Warnings) >= 0.029 perl(YAML::PP) qemu-kvm /usr/bin/qemu-img /usr/bin/qemu-system-i386 +# The following line is generated from dependencies.yaml (upstream) +%define devel_requires %test_requires perl(Devel::Cover) perl(Devel::Cover::Report::Codecov) perl(Perl::Tidy) BuildRequires: perl-devel BuildRequires: perl-generators @@ -102,7 +84,7 @@ Recommends: qemu >= 2.0.0 Recommends: qemu-kvm Recommends: /usr/bin/qemu-img BuildRequires: %test_requires -Requires: %main_requires %requires_not_needed_in_tests +Requires: %main_requires Requires(pre): %{_bindir}/getent Requires(pre): %{_sbindir}/useradd @@ -172,8 +154,7 @@ make INSTALLDIRS=vendor %{?_smp_mflags} %install %make_install INSTALLDIRS=vendor # only internal stuff -rm %{buildroot}%{_libexecdir}/os-autoinst/tools/{tidy,check_coverage,absolutize,docker_run_ci,update-deps} -rm -r %{buildroot}%{_libexecdir}/os-autoinst/tools/lib/perlcritic +rm -r %{buildroot}%{_libexecdir}/os-autoinst/tools/ # we don't really need to ship this in the package, usually the web UI # is much better for needle editing rm %{buildroot}%{_libexecdir}/os-autoinst/crop.py* @@ -189,12 +170,15 @@ find %{buildroot} -depth -type d -and -not -name distri -exec rmdir {} \; export NO_BRP_STALE_LINK_ERROR=yes %check -# disable code quality checks - not worth the time for package builds -sed '/perlcritic/d' -i Makefile +# we may not pull Perl::Critic in for RPM builds as we don't run code +# quality checks, so cut it from cpanfile ahead of the next check sed '/Perl::Critic/d' -i cpanfile -sed '/tidy/d' -i Makefile +# should work offline +for p in $(cpanfile-dump); do rpm -q --whatprovides "perl($p)"; done +# 00-compile-check-all.t fails if this is present and Perl::Critic is +# not installed rm tools/lib/perlcritic/Perl/Critic/Policy/*.pm -make check test VERBOSE=1 CHECK_DOC=0 +make test VERBOSE=1 %post openvswitch %systemd_post os-autoinst-openvswitch.service @@ -230,8 +214,6 @@ make check test VERBOSE=1 CHECK_DOC=0 %{_libexecdir}/os-autoinst/backend %{_libexecdir}/os-autoinst/OpenQA %{_libexecdir}/os-autoinst/consoles -%dir %{_libexecdir}/os-autoinst/tools -%{_libexecdir}/os-autoinst/tools/preparepool %{_libexecdir}/os-autoinst/autotest.pm %{_bindir}/isotovideo %{_bindir}/debugviewer @@ -245,6 +227,9 @@ make check test VERBOSE=1 CHECK_DOC=0 %files devel %changelog +* Wed Jun 10 2020 Adam Williamson - 4.6-16.20200610gitf38e8b17 +- Bump to latest git, resync spec again + * Mon Jun 08 2020 Adam Williamson - 4.6-15.20200608gitbcbc6c41 - Bump to latest git, resync spec with upstream diff --git a/sources b/sources index 057c478..4a5d9d1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (os-autoinst-bcbc6c412cbd69ab461d5448f8bf08b5371a0adb.tar.gz) = df061b71621139737a7dae934810cb44354cb2c635e8ef61c0cef1f02e8dfb0b4419f2c2018f4e60d596622ada1d5c63f3a54cf7e65f7be89954f50125cf8a42 +SHA512 (os-autoinst-f38e8b174dc1a0cace4d624a197a297f9efdc2bb.tar.gz) = 5b6f1f7677b136f8fce66af92d468eb334cfb7d24cdb2622b3fbecc7aae8b069ecb969e5e35c22173f19470bf79d97503a8b82e372518ad0a6031e5f6d70779b