New upstream release 4.1.14
This commit is contained in:
Lubomír Sedlář
parent
d01df63d42
commit
eba2dfa549
@ -1,39 +0,0 @@
|
||||
From 1647f7612a2f59b726160122b6d9a6c5ec67ccb2 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
|
||||
Date: Mon, 6 Mar 2017 19:31:03 +0100
|
||||
Subject: [PATCH] image-build: Remove check for number of images
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
If task does not produce the expected number of images, it should fail
|
||||
at Koji level. Also, this check does not really work when some
|
||||
architectures are allowed to fail.
|
||||
|
||||
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
|
||||
---
|
||||
pungi/phases/image_build.py | 8 --------
|
||||
1 file changed, 8 deletions(-)
|
||||
|
||||
diff --git a/pungi/phases/image_build.py b/pungi/phases/image_build.py
|
||||
index bd18d3a..1327a0e 100644
|
||||
--- a/pungi/phases/image_build.py
|
||||
+++ b/pungi/phases/image_build.py
|
||||
@@ -211,14 +211,6 @@ class CreateImageBuildThread(WorkerThread):
|
||||
image_infos.append({'path': path, 'suffix': suffix, 'type': format, 'arch': arch})
|
||||
break
|
||||
|
||||
- if len(image_infos) != len(cmd['format']) * (len(arches) - len(self.failable_arches)):
|
||||
- self.pool.log_error(
|
||||
- "Error in koji task %s. Expected to find same amount of images "
|
||||
- "as in suffixes attr in image-build (%s) for each arch (%s). Got '%s'." %
|
||||
- (output["task_id"], len(cmd['format']),
|
||||
- len(arches), len(image_infos)))
|
||||
- self.fail(compose, cmd)
|
||||
-
|
||||
# The usecase here is that you can run koji image-build with multiple --format
|
||||
# It's ok to do it serialized since we're talking about max 2 images per single
|
||||
# image_build record
|
||||
--
|
||||
2.9.3
|
||||
|
||||
42
pungi.spec
42
pungi.spec
@ -1,13 +1,12 @@
|
||||
Name: pungi
|
||||
Version: 4.1.13
|
||||
Release: 2%{?dist}
|
||||
Version: 4.1.14
|
||||
Release: 1%{?dist}
|
||||
Summary: Distribution compose tool
|
||||
|
||||
Group: Development/Tools
|
||||
License: GPLv2
|
||||
URL: https://pagure.io/pungi
|
||||
Source0: https://pagure.io/releases/%{name}/%{name}-%{version}.tar.bz2
|
||||
Patch0: 0001-image-build-Remove-check-for-number-of-images.patch
|
||||
|
||||
BuildRequires: python-nose, python-mock
|
||||
BuildRequires: python-devel, python-setuptools, python2-productmd >= 1.3
|
||||
@ -16,6 +15,9 @@ BuildRequires: python-lxml, libselinux-python, yum-utils, lorax, python-rpm
|
||||
BuildRequires: yum => 3.4.3-28, createrepo >= 0.4.11
|
||||
BuildRequires: gettext, git-core, cvs
|
||||
BuildRequires: python-jsonschema
|
||||
BuildRequires: python-enum34
|
||||
BuildRequires: python2-dnf
|
||||
BuildRequires: python2-multilib
|
||||
|
||||
#deps for doc building
|
||||
BuildRequires: python-sphinx, texlive-latex-bin-bin, texlive-collection-fontsrecommended
|
||||
@ -51,6 +53,9 @@ Requires: gettext
|
||||
Requires: git
|
||||
Requires: python-jsonschema
|
||||
Requires: libguestfs-tools-c
|
||||
Requires: python-enum34
|
||||
Requires: python2-dnf
|
||||
Requires: python2-multilib
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
@ -69,7 +74,6 @@ notification to Fedora Message Bus.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
%{__python} setup.py build
|
||||
@ -98,6 +102,7 @@ cd tests && ./test_compose.sh
|
||||
%{python_sitelib}/%{name}-%{version}-py?.?.egg-info
|
||||
%{_bindir}/%{name}
|
||||
%{_bindir}/%{name}-koji
|
||||
%{_bindir}/%{name}-gather
|
||||
%{_bindir}/comps_filter
|
||||
%{_bindir}/%{name}-make-ostree
|
||||
%{_mandir}/man1/pungi.1.gz
|
||||
@ -109,8 +114,37 @@ cd tests && ./test_compose.sh
|
||||
%{_bindir}/%{name}-create-unified-isos
|
||||
%{_bindir}/%{name}-config-validate
|
||||
%{_bindir}/%{name}-fedmsg-notification
|
||||
%{_bindir}/%{name}-patch-iso
|
||||
%{_bindir}/%{name}-compare-depsolving
|
||||
|
||||
%changelog
|
||||
* Tue Mar 28 2017 Lubomír Sedlář <lsedlar@redhat.com> - 4.1.14-1
|
||||
- Not create empty skeleton dirs for empty variants (qwan)
|
||||
- Query only active modules in PDC. (jkaluza)
|
||||
- Save modules metadata as full yaml object (jkaluza)
|
||||
- Implement DNF based depsolving (dmach, mmraka, lsedlar)
|
||||
- Add support for modular composes (jkaluza)
|
||||
- Add a script for modifying ISO images (lsedlar)
|
||||
- iso-wrapper: Add utility for mounting images (lsedlar)
|
||||
- buildinstall: Move tweaking configs into a function (lsedlar)
|
||||
- image-build: Correctly write can_fail option (lsedlar)
|
||||
- pungi-koji: new cmd option '--latest-link-status' (qwan)
|
||||
- Print task ID for successful tasks (lsedlar)
|
||||
- ostree-installer: Fix logging directory (lsedlar)
|
||||
- buildinstall: Print debug info if unmount fails (lsedlar)
|
||||
- pkgset: report all unsigned packages (qwan)
|
||||
- default createrepo_checksum to sha256 (qwan)
|
||||
- unified-iso: Log better error when linking fails (lsedlar)
|
||||
- unified-iso: Blacklist extra files metadata (lsedlar)
|
||||
- buildinstall: Retry unmounting image (lsedlar)
|
||||
- Remove indices from documentation (lsedlar)
|
||||
- iso-wrapper: Handle wrong implant md5 (lsedlar)
|
||||
- image-build: Remove check for number of images (lsedlar)
|
||||
- Extract only first version from specfile (lsedlar)
|
||||
- consolidate repo option names (qwan)
|
||||
- checks: extend validator with 'alias' (qwan)
|
||||
- osbs: write manifest for scratch osbs (qwan)
|
||||
|
||||
* Mon Mar 06 2017 Lubomír Sedlář <lsedlar@redhat.com> - 4.1.13-2
|
||||
- Remove check for number of images
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (pungi-4.1.13.tar.bz2) = 929e36b4ce62ca5c2adc739fdced9e98b36592e583be24bc556f5e73fc0c6fc332d5cca0be53c2c36d851c4134dd1754930ce56e5c2b9464a35598c88794b722
|
||||
SHA512 (pungi-4.1.14.tar.bz2) = f6f0c412c318e8fb65caaadaed592a5f4be309f3833c2649583878a722e46b5e3a92362dde205302b93ee5fd06ef6ef265fedc50c5cdbd434d311095490b315d
|
||||
|
||||
Loading…
Reference in New Issue
Block a user