diff --git a/os-autoinst-4.6.1723465309.cf7b098.obscpio b/os-autoinst-4.6.1723465309.cf7b098.obscpio deleted file mode 100644 index 50408be..0000000 --- a/os-autoinst-4.6.1723465309.cf7b098.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a7639adf897db3b1eef23043bd8ea0708984d5af8282bd72128fd1760d2b3a8b -size 36965901 diff --git a/os-autoinst-4.6.1723817204.0aff9e8.obscpio b/os-autoinst-4.6.1723817204.0aff9e8.obscpio new file mode 100644 index 0000000..3313f09 --- /dev/null +++ b/os-autoinst-4.6.1723817204.0aff9e8.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d0aa664943611cbc93c2a3fa7e01f28c76c11e5731f4c5cfaa9f0e17dceb5fc +size 36966925 diff --git a/os-autoinst-devel-test.spec b/os-autoinst-devel-test.spec index 65ed5ea..c8a334d 100644 --- a/os-autoinst-devel-test.spec +++ b/os-autoinst-devel-test.spec @@ -18,7 +18,7 @@ %define short_name os-autoinst-devel Name: %{short_name}-test -Version: 4.6.1723465309.cf7b098 +Version: 4.6.1723817204.0aff9e8 Release: 0 Summary: Test package for %{short_name} License: GPL-2.0-or-later diff --git a/os-autoinst-openvswitch-test.spec b/os-autoinst-openvswitch-test.spec index 29c0b92..2deac87 100644 --- a/os-autoinst-openvswitch-test.spec +++ b/os-autoinst-openvswitch-test.spec @@ -19,7 +19,7 @@ %define name_ext -test %define short_name os-autoinst-openvswitch Name: %{short_name}%{?name_ext} -Version: 4.6.1723465309.cf7b098 +Version: 4.6.1723817204.0aff9e8 Release: 0 Summary: test package for %{short_name} License: GPL-2.0-or-later diff --git a/os-autoinst-test.spec b/os-autoinst-test.spec index a8ed6d6..9e047eb 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.1723465309.cf7b098 +Version: 4.6.1723817204.0aff9e8 Release: 0 Summary: test package for os-autoinst License: GPL-2.0-or-later diff --git a/os-autoinst.changes b/os-autoinst.changes index 13c83d8..3eb7319 100644 --- a/os-autoinst.changes +++ b/os-autoinst.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Aug 16 17:18:25 UTC 2024 - okurz@suse.com + +- Update to version 4.6.1723817204.0aff9e8: + * Allow package builds without `Inline::Python` + * Avoid dependency on `File::Touch` for easier SLE submission + * systemd: Fix path to os-autoinst-openvswitch (regression from aa027ef4) + * Fix script/ folder install + * Consistently provide all scripts in script/ + * Add help for os-autoinst-setup-multi-machine + ------------------------------------------------------------------- Mon Aug 12 12:21:57 UTC 2024 - okurz@suse.com diff --git a/os-autoinst.obsinfo b/os-autoinst.obsinfo index 74c847e..14360f0 100644 --- a/os-autoinst.obsinfo +++ b/os-autoinst.obsinfo @@ -1,4 +1,4 @@ name: os-autoinst -version: 4.6.1723465309.cf7b098 -mtime: 1723465309 -commit: cf7b09887c625d2094a3e6dd2e4616f859fc874b +version: 4.6.1723817204.0aff9e8 +mtime: 1723817204 +commit: 0aff9e8a9a2361f5eb2c765e95135918e1a7edab diff --git a/os-autoinst.spec b/os-autoinst.spec index c9b2843..d24a2dd 100644 --- a/os-autoinst.spec +++ b/os-autoinst.spec @@ -17,7 +17,7 @@ Name: os-autoinst -Version: 4.6.1723465309.cf7b098 +Version: 4.6.1723817204.0aff9e8 Release: 0 Summary: OS-level test automation License: GPL-2.0-or-later @@ -36,7 +36,7 @@ Source0: %{name}-%{version}.tar.xz # 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(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::Map) perl(File::Path) perl(File::Temp) perl(File::Touch) perl(File::Which) perl(File::chdir) 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(JSON::Validator) 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) >= 9.340.0 perl(Mojolicious::Lite) perl(Net::DBus) perl(Net::Domain) 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(Time::Moment) perl(Time::Seconds) perl(Try::Tiny) perl(XML::LibXML) perl(XML::SemanticDiff) perl(YAML::PP) perl(YAML::XS) perl(autodie) perl(base) perl(constant) perl(integer) perl(strict) perl(version) perl(warnings) perl-base rsync sshpass +%define main_requires git-core perl(B::Deparse) perl(Carp) perl(Carp::Always) 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::Map) perl(File::Path) perl(File::Temp) perl(File::Which) perl(File::chdir) 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(JSON::Validator) 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) >= 9.340.0 perl(Mojolicious::Lite) perl(Net::DBus) perl(Net::Domain) 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(Time::Moment) perl(Time::Seconds) perl(Try::Tiny) perl(XML::LibXML) perl(XML::SemanticDiff) perl(YAML::PP) perl(YAML::XS) perl(autodie) perl(base) perl(constant) perl(integer) perl(strict) perl(version) perl(warnings) perl-base rsync sshpass # all requirements needed by the tests, do not require on this in the package # itself or any sub-packages # SLE is missing spell check requirements @@ -67,6 +67,18 @@ Source0: %{name}-%{version}.tar.xz %else %bcond_with black %endif +# SLE is missing Python support requirements +%if !0%{?is_opensuse} +%bcond_without python_support +%else +%bcond_with python_support +%endif +%if %{with python_support} +# The following line is generated from dependencies.yaml +%define python_support_requires perl(Inline::Python) +%else +%define python_support_requires %{nil} +%endif %if %{with black} # The following line is generated from dependencies.yaml %define python_style_requires python3-black @@ -95,7 +107,7 @@ Source0: %{name}-%{version}.tar.xz # The following line is generated from dependencies.yaml %define test_version_only_requires perl(Mojo::IOLoop::ReadWriteProcess) >= 0.28 # The following line is generated from dependencies.yaml -%define test_requires %build_requires %ocr_requires %spellcheck_requires %test_base_requires %test_non_s390_requires %yamllint_requires perl(Inline::Python) python3-Pillow-tk +%define test_requires %build_requires %ocr_requires %spellcheck_requires %test_base_requires %test_non_s390_requires %yamllint_requires python3-Pillow-tk # The following line is generated from dependencies.yaml %define devel_requires %python_style_requires %test_requires ShellCheck perl(Code::TidyAll) perl(Devel::Cover) perl(Devel::Cover::Report::Codecov) perl(Module::CPANfile) perl(Perl::Tidy) perl(Template::Toolkit) shfmt %define s390_zvm_requires /usr/bin/xkbcomp /usr/bin/Xvnc x3270 icewm xterm xterm-console xdotool fonts-config mkfontdir mkfontscale openssh-clients @@ -111,8 +123,10 @@ Recommends: tesseract-ocr Recommends: %qemu_requires Recommends: dumponlyconsole %s390_zvm_requires Recommends: qemu >= 4.0.0 +%if %{with python_support} # Optional dependency for Python test API support Recommends: perl(Inline::Python) +%endif # Optional dependency for crop.py Recommends: python3-Pillow-tk # Optional dependency for QEMU's built-in samba service (enabled via QEMU_ENABLE_SMBD=1)