Handle failed subtasks when getting Koji results
This commit is contained in:
parent
6df1a3e389
commit
d98f0168b0
37
0001-koji-wrapper-Handle-failed-subtasks.patch
Normal file
37
0001-koji-wrapper-Handle-failed-subtasks.patch
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
From 81b71b9ed30547ac3aa4ac94716fa958f61c7a92 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
|
||||||
|
Date: Mon, 12 Jun 2017 18:15:29 +0200
|
||||||
|
Subject: [PATCH] koji-wrapper: Handle failed subtasks
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
If a subtask fails, we can't ask about it's results as that would raise
|
||||||
|
an exception. We can safely assume that since the parent succeeded, any
|
||||||
|
failed child is actually allowed to fail.
|
||||||
|
|
||||||
|
Fixes: #641
|
||||||
|
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
|
||||||
|
---
|
||||||
|
pungi/wrappers/kojiwrapper.py | 5 +++++
|
||||||
|
1 file changed, 5 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/pungi/wrappers/kojiwrapper.py b/pungi/wrappers/kojiwrapper.py
|
||||||
|
index 4596b66..b0744bc 100644
|
||||||
|
--- a/pungi/wrappers/kojiwrapper.py
|
||||||
|
+++ b/pungi/wrappers/kojiwrapper.py
|
||||||
|
@@ -354,6 +354,11 @@ class KojiWrapper(object):
|
||||||
|
if child_task['method'] not in ['createImage', 'createLiveMedia', 'createAppliance']:
|
||||||
|
continue
|
||||||
|
|
||||||
|
+ if child_task['state'] != koji.TASK_STATES['CLOSED']:
|
||||||
|
+ # The subtask is failed, which can happen with the can_fail
|
||||||
|
+ # option. Let's ignore it then.
|
||||||
|
+ continue
|
||||||
|
+
|
||||||
|
is_scratch = child_task['request'][-1].get('scratch', False)
|
||||||
|
task_result = self.koji_proxy.getTaskResult(child_task['id'])
|
||||||
|
|
||||||
|
--
|
||||||
|
2.9.4
|
||||||
|
|
@ -1,12 +1,13 @@
|
|||||||
Name: pungi
|
Name: pungi
|
||||||
Version: 4.1.16
|
Version: 4.1.16
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: Distribution compose tool
|
Summary: Distribution compose tool
|
||||||
|
|
||||||
Group: Development/Tools
|
Group: Development/Tools
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
URL: https://pagure.io/pungi
|
URL: https://pagure.io/pungi
|
||||||
Source0: https://pagure.io/releases/%{name}/%{name}-%{version}.tar.bz2
|
Source0: https://pagure.io/releases/%{name}/%{name}-%{version}.tar.bz2
|
||||||
|
Patch0: 0001-koji-wrapper-Handle-failed-subtasks.patch
|
||||||
|
|
||||||
BuildRequires: python-nose, python-mock
|
BuildRequires: python-nose, python-mock
|
||||||
BuildRequires: python-devel, python-setuptools, python2-productmd >= 1.3
|
BuildRequires: python-devel, python-setuptools, python2-productmd >= 1.3
|
||||||
@ -76,6 +77,7 @@ notification to Fedora Message Bus.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch0 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%{__python} setup.py build
|
%{__python} setup.py build
|
||||||
@ -120,6 +122,9 @@ cd tests && ./test_compose.sh
|
|||||||
%{_bindir}/%{name}-compare-depsolving
|
%{_bindir}/%{name}-compare-depsolving
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jun 13 2017 Lubomír Sedlář <lsedlar@redhat.com> - 4.1.16-2
|
||||||
|
- Handle failed subtasks when getting Koji results
|
||||||
|
|
||||||
* Mon Jun 12 2017 Lubomír Sedlář <lsedlar@redhat.com> - 4.1.16-1
|
* Mon Jun 12 2017 Lubomír Sedlář <lsedlar@redhat.com> - 4.1.16-1
|
||||||
- Fix changelog generator script (lsedlar)
|
- Fix changelog generator script (lsedlar)
|
||||||
- util: Retry resolving git branches (lsedlar)
|
- util: Retry resolving git branches (lsedlar)
|
||||||
|
Loading…
Reference in New Issue
Block a user