From 6c79af2bbcc95b3de8434bfb937be1dd0873716a4a0d5879cce8ef9fcb963173 Mon Sep 17 00:00:00 2001 From: Oliver Kurz Date: Thu, 30 Jul 2020 19:26:12 +0000 Subject: [PATCH] Offline generation of 4.6.1596123333.53214479 4.6.1596123333.53214479 OBS-URL: https://build.opensuse.org/package/show/devel:openQA:tested/os-autoinst?expand=0&rev=385 --- os-autoinst-4.6.1595922953.775a5164.obscpio | 3 -- os-autoinst-4.6.1596123333.53214479.obscpio | 3 ++ os-autoinst-test.spec | 2 +- os-autoinst.changes | 21 +++++++++++ os-autoinst.obsinfo | 6 +-- os-autoinst.spec | 41 +++++++++++++++++++-- 6 files changed, 66 insertions(+), 10 deletions(-) delete mode 100644 os-autoinst-4.6.1595922953.775a5164.obscpio create mode 100644 os-autoinst-4.6.1596123333.53214479.obscpio diff --git a/os-autoinst-4.6.1595922953.775a5164.obscpio b/os-autoinst-4.6.1595922953.775a5164.obscpio deleted file mode 100644 index fec2788..0000000 --- a/os-autoinst-4.6.1595922953.775a5164.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:75ad6f1aa90266727c903264b9810550fa4aa8a08a4090fe25a2e0ae51c6c218 -size 25022477 diff --git a/os-autoinst-4.6.1596123333.53214479.obscpio b/os-autoinst-4.6.1596123333.53214479.obscpio new file mode 100644 index 0000000..a4b1ddc --- /dev/null +++ b/os-autoinst-4.6.1596123333.53214479.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3cf84ac06a2c619c7fbc0c2a52d1f8511a962eb093a4e8d8c90d7ad93ff575ef +size 25026573 diff --git a/os-autoinst-test.spec b/os-autoinst-test.spec index a13af6e..168d1ba 100644 --- a/os-autoinst-test.spec +++ b/os-autoinst-test.spec @@ -19,7 +19,7 @@ %define name_ext -test %define short_name os-autoinst Name: %{short_name}%{?name_ext} -Version: 4.6.1595922953.775a5164 +Version: 4.6.1596123333.53214479 Release: 0 Summary: test package for os-autoinst #BuildRequires: %{short_name} == %{version} diff --git a/os-autoinst.changes b/os-autoinst.changes index 42dbeee..518b95b 100644 --- a/os-autoinst.changes +++ b/os-autoinst.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Thu Jul 30 19:25:53 UTC 2020 - okurz@suse.com + +- Update to version 4.6.1596123333.53214479: + * Also fix chdir bug in other tests using temp dirs + * Fix issue where 99-full-stack.t can't cleanup temp dir on test failure + * Fix swapped actual/expected args in check in svirt test + * Record a reason if isotovideo received a signal to stop + * Record QEMU stopping unexpectedly as failure reason + * Provide a reason in certain errors encountered by isotovideo + * Merge INSTALL documentation into README + * os-autoinst-openvswitch: Fix spurious network startup race-conditions (2nd) + * Use C-style for loop for iterating testorder to react to length changes + * Revert "Revert "Avoid updating last_good if there's no possible user of it"" + * mergify: Add merge-fast shortcut, same as for openQA + * Use autotools-based build system as fallback on SLE12 + * Re-establish compatibility with OpenCV 3 + * Revert "Avoid updating last_good if there's no possible user of it" + * Make local VM host IPs '10.0.2.2' configurable + * Ensure qemu dbus failures are handled correctly + ------------------------------------------------------------------- Tue Jul 28 11:25:52 UTC 2020 - okurz@suse.com diff --git a/os-autoinst.obsinfo b/os-autoinst.obsinfo index ec7d5fa..f993442 100644 --- a/os-autoinst.obsinfo +++ b/os-autoinst.obsinfo @@ -1,5 +1,5 @@ name: os-autoinst -version: 4.6.1595922953.775a5164 -mtime: 1595922953 -commit: 775a5164fa01e2ba67ec57f3ec014f12eb969fdd +version: 4.6.1596123333.53214479 +mtime: 1596123333 +commit: 5321447958ae80f4bf404f17656dd2d0fde59677 diff --git a/os-autoinst.spec b/os-autoinst.spec index a9fa2f2..8639ad6 100644 --- a/os-autoinst.spec +++ b/os-autoinst.spec @@ -17,7 +17,7 @@ Name: os-autoinst -Version: 4.6.1595922953.775a5164 +Version: 4.6.1596123333.53214479 Release: 0 Summary: OS-level test automation License: GPL-2.0-or-later @@ -32,7 +32,11 @@ Source0: %{name}-%{version}.tar.xz %define opencv_require pkgconfig(opencv) %endif # The following line is generated from dependencies.yaml -%define build_requires %opencv_require cmake gcc-c++ ninja perl(Pod::Html) pkg-config pkgconfig(fftw3) pkgconfig(libpng) pkgconfig(sndfile) pkgconfig(theoraenc) +%define build_base_requires %opencv_require gcc-c++ perl(Pod::Html) pkg-config pkgconfig(fftw3) pkgconfig(libpng) pkgconfig(sndfile) pkgconfig(theoraenc) +# The following line is generated from dependencies.yaml +%define build_legacy_requires %build_base_requires autoconf automake libtool make perl(ExtUtils::Embed) perl(ExtUtils::MakeMaker) >= 6.66 perl(Module::CPANfile) +# The following line is generated from dependencies.yaml +%define build_requires %build_base_requires cmake ninja # The following line is generated from dependencies.yaml %define main_requires 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.26 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(version) perl(warnings) perl-base # all requirements needed by the tests, do not require on this in the package @@ -46,14 +50,24 @@ Source0: %{name}-%{version}.tar.xz %if %{with spellcheck} # The following line is generated from dependencies.yaml %define spellcheck_requires aspell-en aspell-spell perl(Pod::Spell) +%define spellcheck_make_args_for_autotools %{nil} %else %define spellcheck_requires %{nil} +%define spellcheck_make_args_for_autotools CHECK_DOC=0 %endif # The following line is generated from dependencies.yaml -%define test_requires %build_requires %main_requires %spellcheck_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) procps python3-setuptools python3-yamllint qemu qemu-tools qemu-x86 +%define test_base_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 procps python3-setuptools qemu qemu-tools qemu-x86 +# The following line is generated from dependencies.yaml +%define test_legacy_requires %build_legacy_requires %test_base_requires +# The following line is generated from dependencies.yaml +%define test_requires %build_requires %spellcheck_requires %test_base_requires perl(YAML::PP) python3-yamllint # The following line is generated from dependencies.yaml %define devel_requires %test_requires perl(Devel::Cover) perl(Devel::Cover::Report::Codecov) perl(Perl::Tidy) +%if 0%{?suse_version} == 1315 +BuildRequires: %test_legacy_requires +%else BuildRequires: %test_requires +%endif Requires: %main_requires Recommends: tesseract-ocr Recommends: /usr/bin/xkbcomp /usr/bin/Xvnc dumponlyconsole @@ -105,12 +119,24 @@ for i in 07-commands 13-osutils 14-isotovideo 18-qemu-options 18-backend-qemu 99 done %build +%if 0%{?suse_version} == 1315 +autoreconf -f -i +%configure --docdir=%{_docdir}/%{name} +make %{?_smp_mflags} INSTALLDIRS=vendor +%else %define __builder ninja %cmake -DOS_AUTOINST_DOC_DIR:STRING=%{_docdir}/%{name} %cmake_build +%endif %install +%if 0%{?suse_version} == 1315 +%make_install INSTALLDIRS=vendor +# remove internal tools +rm -r %{buildroot}/usr/lib/os-autoinst/tools/ +%else %cmake_install install-openvswitch +%endif ls -lR %buildroot find %{buildroot} -type f -name .packlist -print0 | xargs -0 --no-run-if-empty rm -f @@ -125,8 +151,17 @@ ln -s ../sbin/service %{buildroot}%{_sbindir}/rcos-autoinst-openvswitch export NO_BRP_STALE_LINK_ERROR=yes %check +%if 0%{?suse_version} == 1315 +sed '/perlcritic/d' -i Makefile +sed '/tidy/d' -i Makefile +sed '/Perl::Critic/d' -i cpanfile +rm -r t/27-make-update-deps.t tools/update-deps +printf '#!/bin/sh\necho YAML syntax check disabled' > tools/check-yaml-syntax +make check test VERBOSE=1 %{spellcheck_make_args_for_autotools} +%else cd %{__builddir} %cmake_build check-pkg-build +%endif %pre openvswitch %service_add_pre os-autoinst-openvswitch.service