From 42fc998a6147cd6a13d472af2a226ffe9c191d0ed14dc6c9895d72c2f63b3c51 Mon Sep 17 00:00:00 2001 From: Oliver Kurz Date: Sat, 18 Feb 2023 02:37:06 +0000 Subject: [PATCH] Offline generation of 4.6.1676641030.f996c8e 4.6.1676641030.f996c8e OBS-URL: https://build.opensuse.org/package/show/devel:openQA:tested/os-autoinst?expand=0&rev=771 --- os-autoinst-4.6.1676451610.d3d76e5.obscpio | 3 --- os-autoinst-4.6.1676641030.f996c8e.obscpio | 3 +++ os-autoinst-test.spec | 2 +- os-autoinst.changes | 14 +++++++++++++ os-autoinst.obsinfo | 6 +++--- os-autoinst.spec | 23 +++++++++++++++++++--- 6 files changed, 41 insertions(+), 10 deletions(-) delete mode 100644 os-autoinst-4.6.1676451610.d3d76e5.obscpio create mode 100644 os-autoinst-4.6.1676641030.f996c8e.obscpio diff --git a/os-autoinst-4.6.1676451610.d3d76e5.obscpio b/os-autoinst-4.6.1676451610.d3d76e5.obscpio deleted file mode 100644 index 404ad10..0000000 --- a/os-autoinst-4.6.1676451610.d3d76e5.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6fc5f9a2e59340f2db3bb44dd0d7dfd47c2c90cbb08ca981ca2513252c862904 -size 34980365 diff --git a/os-autoinst-4.6.1676641030.f996c8e.obscpio b/os-autoinst-4.6.1676641030.f996c8e.obscpio new file mode 100644 index 0000000..d5136e1 --- /dev/null +++ b/os-autoinst-4.6.1676641030.f996c8e.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5afbfdccac381dd5608ee8f40cface59cb5f13653422014510eb7e302e283b3b +size 34980877 diff --git a/os-autoinst-test.spec b/os-autoinst-test.spec index 80eb263..657eeb8 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.1676451610.d3d76e5 +Version: 4.6.1676641030.f996c8e 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 a5fdf73..4dbd653 100644 --- a/os-autoinst.changes +++ b/os-autoinst.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Sat Feb 18 02:36:48 UTC 2023 - okurz@suse.com + +- Update to version 4.6.1676641030.f996c8e: + * Disable test for OCR feature on archs where we lack dependencies + * testapi: Fix 'snd2png' call arguments introduced in 264fcd83 + * Introduce VNC_EXTRA_VARS variable + * Fix retry logic for git clone + * Turn off commit signing in git tests + * Use proper perl "signatures" in testapi + * t: Remove unnecessary uncovered mocking in 03-testapi.t + * t: Cleanup temporary file from 03-testapi.t at end of test + * testapi: Add signatures for various, now test-covered functions + ------------------------------------------------------------------- Wed Feb 15 09:00:17 UTC 2023 - okurz@suse.com diff --git a/os-autoinst.obsinfo b/os-autoinst.obsinfo index 6ab5141..0197ac0 100644 --- a/os-autoinst.obsinfo +++ b/os-autoinst.obsinfo @@ -1,4 +1,4 @@ name: os-autoinst -version: 4.6.1676451610.d3d76e5 -mtime: 1676451610 -commit: d3d76e57beb6f45ace755b50d3b5c53c8a263606 +version: 4.6.1676641030.f996c8e +mtime: 1676641030 +commit: f996c8e238fc1cb63c6c3b30328970dd54b1ea00 diff --git a/os-autoinst.spec b/os-autoinst.spec index bd2529a..8f9cd7c 100644 --- a/os-autoinst.spec +++ b/os-autoinst.spec @@ -17,7 +17,7 @@ Name: os-autoinst -Version: 4.6.1676451610.d3d76e5 +Version: 4.6.1676641030.f996c8e Release: 0 Summary: OS-level test automation License: GPL-2.0-or-later @@ -73,12 +73,23 @@ Source0: %{name}-%{version}.tar.xz %else %define python_style_requires %{nil} %endif +%ifnarch ppc ppc64 ppc64le s390x +%bcond_without ocr +%else +%bcond_with ocr +%endif +%if %{with ocr} +# The following line is generated from dependencies.yaml +%define ocr_requires tesseract-ocr tesseract-ocr-traineddata-english +%else +%define ocr_requires %{nil} +%endif # The following line is generated from dependencies.yaml %define test_base_requires %main_requires cpio icewm perl(Benchmark) perl(Devel::Cover) perl(FindBin) perl(Pod::Coverage) perl(Test::Fatal) perl(Test::Mock::Time) perl(Test::MockModule) perl(Test::MockObject) perl(Test::MockRandom) perl(Test::Mojo) perl(Test::Most) perl(Test::Output) perl(Test::Pod) perl(Test::Strict) perl(Test::Warnings) >= 0.029 procps python3-setuptools qemu >= 4.0 qemu-tools qemu-x86 xorg-x11-Xvnc xterm xterm-console # 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 %spellcheck_requires %test_base_requires %yamllint_requires perl(Inline::Python) python3-Pillow-tk tesseract-ocr tesseract-ocr-traineddata-english +%define test_requires %build_requires %ocr_requires %spellcheck_requires %test_base_requires %yamllint_requires perl(Inline::Python) 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(Perl::Tidy) perl(Template::Toolkit) %define s390_zvm_requires /usr/bin/xkbcomp /usr/bin/Xvnc x3270 icewm xterm xterm-console xdotool fonts-config mkfontdir mkfontscale @@ -86,10 +97,12 @@ BuildRequires: %test_requires %test_version_only_requires # For unbuffered output of Perl testsuite, especially when running it on OBS so timestamps in the log are actually useful BuildRequires: expect Requires: %main_requires +%if %{with ocr} +Recommends: tesseract-ocr +%endif Recommends: dumponlyconsole %s390_zvm_requires Recommends: qemu >= 4.0.0 Recommends: qemu-tools -Recommends: tesseract-ocr # Optional dependency for Python test API support Recommends: perl(Inline::Python) # Optional dependency for crop.py @@ -185,6 +198,10 @@ rm xt/00-tidy.t rm xt/30-make.t # https://progress.opensuse.org/issues/114881 rm t/27-consoles-vmware.t +# exclude tests requiring OCR dependencies when those are disabled +%if %{without ocr} +rm t/02-test_ocr.t +%endif %build %define __builder ninja