From e9f6402448f9fd3f74ff142ad31344ef500d73ab Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 24 Jan 2022 14:45:15 -0800 Subject: [PATCH] Update to latest git --- .gitignore | 1 + ...-disable-xterm-console-dependent-ass.patch | 32 +++++++++++++++++++ os-autoinst.spec | 27 ++++++++++++---- sources | 2 +- 4 files changed, 55 insertions(+), 7 deletions(-) create mode 100644 0001-NOT-UPSTREAMABLE-disable-xterm-console-dependent-ass.patch diff --git a/.gitignore b/.gitignore index 7731b37..2519d93 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,4 @@ /os-autoinst-5361bf1c6c542b41f7dac978ca59e43e267789b0.tar.gz /os-autoinst-ad28b4b59369ada5731ebd7f0916bc2e52324988.tar.gz /os-autoinst-627473ea5222dd4ad4cb0bfe82f0d5b5bcbe23c8.tar.gz +/os-autoinst-fdd1a2d8bdc9fdf9b23ae8f01b42b5092e6343dd.tar.gz diff --git a/0001-NOT-UPSTREAMABLE-disable-xterm-console-dependent-ass.patch b/0001-NOT-UPSTREAMABLE-disable-xterm-console-dependent-ass.patch new file mode 100644 index 0000000..ea7b74d --- /dev/null +++ b/0001-NOT-UPSTREAMABLE-disable-xterm-console-dependent-ass.patch @@ -0,0 +1,32 @@ +From 7563875c62a44c9f9bc143b74bcb667c04ac3c33 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Wed, 19 Jan 2022 15:40:57 -0800 +Subject: [PATCH] NOT UPSTREAMABLE: disable xterm-console dependent assertions + +These assertions don't work without xterm-console. + +Signed-off-by: Adam Williamson +--- + t/29-backend-ipmi.t | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/t/29-backend-ipmi.t b/t/29-backend-ipmi.t +index abaf2463..f3ed64bd 100755 +--- a/t/29-backend-ipmi.t ++++ b/t/29-backend-ipmi.t +@@ -45,9 +45,9 @@ ok $backend->do_stop_vm, 'can call do_stop_vm'; + ok !$backend->check_socket(undef), 'check_socket not returning true by default'; + ok $backend->get_mc_status, 'can call get_mc_status'; + +-is $testapi::distri->{consoles}->{sol}->{args}->{log}, '1'; +-$testapi::distri->{consoles}->{sol}->{DISPLAY} = "display"; +-ok !$testapi::distri->{consoles}->{sol}->callxterm('ipmi', "console"), "can create console with log enabled"; ++#is $testapi::distri->{consoles}->{sol}->{args}->{log}, '1'; ++#$testapi::distri->{consoles}->{sol}->{DISPLAY} = "display"; ++#ok !$testapi::distri->{consoles}->{sol}->callxterm('ipmi', "console"), "can create console with log enabled"; + + # reduce retries for testing + $bmwqemu::vars{IPMI_MC_RESET_MAX_TRIES} = $bmwqemu::vars{IPMI_MC_RESET_TIMEOUT} = 3; +-- +2.34.1 + diff --git a/os-autoinst.spec b/os-autoinst.spec index 822ab81..709ab26 100644 --- a/os-autoinst.spec +++ b/os-autoinst.spec @@ -24,15 +24,15 @@ # them to the perl vendor dir, but they wouldn't bite. # https://github.com/os-autoinst/os-autoinst/issues/387 %global __provides_exclude_from %{_prefix}/lib/os-autoinst -%global __requires_exclude perl\\((autotest|backend|basetest|bmwqemu|commands|consoles|cv|distribution|lockapi|mmapi|myjsonrpc|needle|ocr|osutils|signalblocker|testapi|OpenQA::Exceptions|OpenQA::Benchmark::Stopwatch|OpenQA::Qemu|OpenQA::Isotovideo) +%global __requires_exclude perl\\((autotest|backend|basetest|bmwqemu|commands|consoles|cv|distribution|lockapi|mmapi|myjsonrpc|needle|ocr|osutils|signalblocker|testapi|OpenQA::Exceptions|OpenQA::Benchmark::Stopwatch|OpenQA::Qemu|OpenQA::Isotovideo|OpenQA::NamedIOSelect) %{?perl_default_filter} %global github_owner os-autoinst %global github_name os-autoinst %global github_version 4.6 -%global github_commit 627473ea5222dd4ad4cb0bfe82f0d5b5bcbe23c8 +%global github_commit fdd1a2d8bdc9fdf9b23ae8f01b42b5092e6343dd # if set, will be a post-release snapshot build, otherwise a 'normal' build -%global github_date 20211126 +%global github_date 20220119 %global shortcommit %(c=%{github_commit}; echo ${c:0:7}) Name: os-autoinst @@ -42,6 +42,9 @@ Summary: OS-level test automation License: GPLv2+ URL: https://os-autoinst.github.io/openQA/ Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{github_commit}/%{github_name}-%{github_commit}.tar.gz +# Disable some test assertions that don't work without xterm-console +# Remove this when we have xterm-console packaged +Patch0: 0001-NOT-UPSTREAMABLE-disable-xterm-console-dependent-ass.patch # on SUSE this is conditional, for us it doesn't have to be but we # still use a macro just to keep build_requires similar for ease of @@ -67,7 +70,9 @@ Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{gith # all requirements needed by the tests, do not require on this in the package # itself or any sub-packages # diff from SUSE: replaced qemu with qemu-kvm, qemu-tools with -# qemu-img, and qemu-x86 with qemu-system-i386 +# qemu-img, qemu-x86 with qemu-system-i386. Dependencies from +# 4b4d3fd omitted for now until xterm-console is packaged for +# Fedora # The following line is generated from dependencies.yaml (upstream) %define test_base_requires %main_requires cpio 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-kvm /usr/bin/qemu-img /usr/bin/qemu-system-i386 # The following line is generated from dependencies.yaml (upstream) @@ -147,6 +152,12 @@ rm -f t/02-test_ocr.t # https://progress.opensuse.org/issues/60755 rm -f t/07-commands.t +# Remove test relying on a git working copy +rm xt/30-make.t + +# This test can't work without xterm-console, which isn't in Fedora yet +rm -f t/27-consoles-local_xvnc.t + %build %cmake -DOS_AUTOINST_DOC_DIR:STRING=%{_docdir}/%{name} -DSYSTEMD_SERVICE_DIR:STRING="%{_unitdir}" -GNinja %ninja_build -C %{__cmake_builddir} @@ -173,6 +184,9 @@ export CI=1 # account for sporadic slowness in build environments # https://progress.opensuse.org/issues/89059 export OPENQA_TEST_TIMEOUT_SCALE_CI=20 +# Enable verbose test output as we can not store test artifacts within package +# build environments in case of needing to investigate failures +export PROVE_ARGS="--timer -v" # 00-compile-check-all.t fails if this is present and Perl::Critic is # not installed rm tools/lib/perlcritic/Perl/Critic/Policy/*.pm @@ -227,8 +241,9 @@ rm tools/lib/perlcritic/Perl/Critic/Policy/*.pm %files devel %changelog -* Thu Jan 20 2022 Fedora Release Engineering - 4.6-44.20211126git627473e -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild +* Mon Jan 24 2022 Adam Williamson - 4.6-44.20220119gitfdd1a2d +- Update to latest git, resync spec +- Disable some tests that don't work without xterm-console * Thu Nov 25 2021 Adam Williamson - 4.6-43.20211126git627473e - Update to latest git, resync spec diff --git a/sources b/sources index b617fe9..8892de2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (os-autoinst-627473ea5222dd4ad4cb0bfe82f0d5b5bcbe23c8.tar.gz) = ce2092237fe81e67fa5292d0ffd1d08f9deda9828831a7794599669067799d77bdff2282fcc760884815d7edfcf5972f4466c6e70caea1dd07ea835d5b0867d4 +SHA512 (os-autoinst-fdd1a2d8bdc9fdf9b23ae8f01b42b5092e6343dd.tar.gz) = c4a865f4aeb713705db15c43f2dc63c8c82dbf3dbe2a6de939452d528be20bc0683df0a589107d0f36c2d9a1bc6cb8553b5af352f179cb85d5761883e65c3f2b