From c4e09dda0a7fb541d3e453bbf8f0db3968fcb88b Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 8 Jul 2016 13:24:41 -0700 Subject: [PATCH] bump to latest git, drop merged patch --- .gitignore | 1 + ...ignal-handler-i.e.-during-worker-can.patch | 29 ------------------- os-autoinst.spec | 24 ++++++++++----- sources | 2 +- 4 files changed, 18 insertions(+), 38 deletions(-) delete mode 100644 0001-Stop-the-vm-on-signal-handler-i.e.-during-worker-can.patch diff --git a/.gitignore b/.gitignore index 1f3b1e1..d6eae26 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /os-autoinst-8b5f22e8a84cc12b3ab8b24992fbb601048adc1b.tar.gz /os-autoinst-ff760a31dbdd8a96bd92683bd5ff45633ee149cd.tar.gz /os-autoinst-fe19b0042b53b88b5816511b50665c32459ae7d2.tar.gz +/os-autoinst-7a1901d0c122345d80a68a0f1ffbe5ac5e6e6ddd.tar.gz diff --git a/0001-Stop-the-vm-on-signal-handler-i.e.-during-worker-can.patch b/0001-Stop-the-vm-on-signal-handler-i.e.-during-worker-can.patch deleted file mode 100644 index 2d663b0..0000000 --- a/0001-Stop-the-vm-on-signal-handler-i.e.-during-worker-can.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 5e04cf7f0e34eaba2884bf70e3f0a93165bad28e Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Mon, 4 Jul 2016 23:48:22 -0700 -Subject: [PATCH] Stop the vm on signal handler (i.e. during worker cancel) - -This is like: -https://github.com/os-autoinst/os-autoinst/pull/524/commits/4d9a31f -but without the changes that don't apply to current git master, -as a temporary fix for #530 (which we're hitting on Fedora -deployments). ---- - isotovideo | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/isotovideo b/isotovideo -index fd5aac6..1ced6f1 100755 ---- a/isotovideo -+++ b/isotovideo -@@ -85,6 +85,7 @@ sub signalhandler { - $autotest::running->fail_if_running(); - $autotest::running = undef; - } -+ bmwqemu::stop_vm(); - if (defined $backend && $backend->{backend_pid}) { - diag("$$: killing backend process $backend->{backend_pid}"); - kill('SIGTERM', $backend->{backend_pid}); --- -2.9.0 - diff --git a/os-autoinst.spec b/os-autoinst.spec index 8074ffe..9720757 100644 --- a/os-autoinst.spec +++ b/os-autoinst.spec @@ -18,29 +18,25 @@ # them to the perl vendor dir, but they wouldn't bite. # https://github.com/os-autoinst/os-autoinst/issues/387 %global __provides_exclude_from %{_libexecdir}/os-autoinst -%global __requires_exclude perl\\((autotest|backend|basetest|bmwqemu|commands|consoles|cv|distribution|lockapi|mmapi|needle|ocr|testapi|OpenQA::Exceptions) +%global __requires_exclude perl\\((autotest|backend|basetest|bmwqemu|commands|consoles|cv|distribution|lockapi|mmapi|myjsonrpc|needle|ocr|testapi|OpenQA::Exceptions) %{?perl_default_filter} %global github_owner os-autoinst %global github_name os-autoinst %global github_version 4.3 -%global github_commit fe19b0042b53b88b5816511b50665c32459ae7d2 +%global github_commit 7a1901d0c122345d80a68a0f1ffbe5ac5e6e6ddd # if set, will be a post-release snapshot build, otherwise a 'normal' build -%global github_date 20160624 +%global github_date 20160708 %global shortcommit %(c=%{github_commit}; echo ${c:0:7}) Name: os-autoinst Version: %{github_version} -Release: 14%{?github_date:.%{github_date}git%{shortcommit}}%{?dist} +Release: 16%{?github_date:.%{github_date}git%{shortcommit}}%{?dist} Summary: OS-level test automation License: GPLv2+ Group: Development/System URL: https://os-autoinst.github.io/openQA/ Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{github_commit}/%{github_name}-%{github_commit}.tar.gz -# This is based on a commit from -# https://github.com/os-autoinst/os-autoinst/pull/524 -# Fixes https://github.com/os-autoinst/os-autoinst/issues/530 -Patch0: 0001-Stop-the-vm-on-signal-handler-i.e.-during-worker-can.patch BuildRequires: autoconf BuildRequires: automake @@ -117,6 +113,10 @@ This package contains Open vSwitch support for os-autoinst. %prep %autosetup -n %{github_name}-%{github_commit} -p1 +install -m 0644 %{SOURCE1} t/data +install -m 0644 %{SOURCE2} t/data +install -m 0644 %{SOURCE3} t/data +install -m 0644 %{SOURCE4} t/data %build mkdir -p m4 @@ -173,6 +173,7 @@ make check VERBOSE=1 %{_libexecdir}/os-autoinst/distribution.pm %{_libexecdir}/os-autoinst/testapi.pm %{_libexecdir}/os-autoinst/mmapi.pm +%{_libexecdir}/os-autoinst/myjsonrpc.pm %{_libexecdir}/os-autoinst/lockapi.pm %{_libexecdir}/os-autoinst/cv.pm %{_libexecdir}/os-autoinst/ocr.pm @@ -194,6 +195,13 @@ make check VERBOSE=1 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.opensuse.os_autoinst.switch.conf %changelog +* Fri Jul 08 2016 Adam Williamson - 4.3-16.20160624git7a1901d +- bump to latest git +- drop merged PR #524 patch + +* Wed Jul 06 2016 Adam Williamson - 4.3-15.20160624gitfe19b00 +- include the whole of PR #524 to help fix multiple interactive mode issues + * Mon Jul 04 2016 Adam Williamson - 4.3-14.20160624gitfe19b00 - fix worker crash on job cancel (#530) with a single commit from PR #524 diff --git a/sources b/sources index 0af704a..9009790 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2b8e12f40cd396631891666e83d95b5a os-autoinst-fe19b0042b53b88b5816511b50665c32459ae7d2.tar.gz +ee218c96e3d4027bfcbc622201a99ea2 os-autoinst-7a1901d0c122345d80a68a0f1ffbe5ac5e6e6ddd.tar.gz