New upstream release

0001-Make-sure-basearch-is-also-replaced-with-config-ostr.patch

@@ -1,34 +0,0 @@
-From c9c5fcac945ae0489c667bfe5ebeeeb617eecf20 Mon Sep 17 00:00:00 2001
-From: Patrick Uiterwijk <patrick@puiterwijk.org>
-Date: Wed, 9 Jan 2019 21:39:33 +0100
-Subject: [PATCH] Make sure ${basearch} is also replaced with
- config['ostree_ref']
-
-Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
----
- pungi/phases/ostree.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/pungi/phases/ostree.py b/pungi/phases/ostree.py
-index 8bbe4434..a6190d75 100644
---- a/pungi/phases/ostree.py
-+++ b/pungi/phases/ostree.py
-@@ -6,6 +6,7 @@ import os
- from kobo import shortcuts
- from kobo.threads import ThreadPool, WorkerThread
- 
-+from pungi.arch_utils import getBaseArch
- from .base import ConfigGuardedPhase
- from .. import util
- from ..ostree.utils import get_ref_from_treefile, get_commitid_from_commitid_file
-@@ -99,6 +100,7 @@ class OSTreeThread(WorkerThread):
-                 logger=self.pool._logger,
-             )
-             ref = config.get("ostree_ref") or original_ref
-+            ref = ref.replace("${basearch}", getBaseArch(arch))
-             # 'pungi-make-ostree tree' writes commitid to commitid.log in
-             # logdir, except if there was no new commit we will get None
-             # instead. If the commit id could not be read, an exception will be
--- 
-2.17.2
-

0001-Only-require-enum34-on-Legacy-Python.patch

@@ -1,39 +0,0 @@
-From 3fe4beb20c50fb54cef31b3cd0e2946067aeb09e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Mon, 14 Jan 2019 09:13:59 +0100
-Subject: [PATCH] Only require enum34 on Legacy Python
-
-This resolves https://bugzilla.redhat.com/show_bug.cgi?id=1665501
-
-Signed-off-by: Why Do You <enforce@this.qm>
----
- setup.py | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 83414556..ab4da262 100755
---- a/setup.py
-+++ b/setup.py
-@@ -57,7 +57,6 @@ setup(
-     ],
-     test_suite      = "tests",
-     install_requires = [
--        "enum34",
-         "jsonschema",
-         "kobo",
-         "lockfile",
-@@ -67,6 +66,11 @@ setup(
-         'dogpile.cache',
-         'dict.sorted',
-         ],
-+    extras_require={
-+        ':python_version=="2.7"': [
-+            'enum34'
-+        ]
-+    },
-     tests_require = [
-         "mock",
-         "nose",
--- 
-2.17.2
-

0001-buildinstall-Pick-correct-config-with-rootfs_size.patch

@@ -1,59 +0,0 @@
-From 8065239e0416b04c1ef0e1b49de530b8fc829c4d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
-Date: Fri, 1 Feb 2019 14:24:20 +0100
-Subject: [PATCH] buildinstall: Pick correct config with rootfs_size
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If there are multiple matching configuration blocks, we should take the
-value that is defined in the last one, but only if it actually is there.
-That's how it works for other options.
-
-Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
----
- pungi/phases/buildinstall.py | 3 ++-
- tests/test_buildinstall.py   | 2 ++
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/pungi/phases/buildinstall.py b/pungi/phases/buildinstall.py
-index 04081def..cb44a31c 100644
---- a/pungi/phases/buildinstall.py
-+++ b/pungi/phases/buildinstall.py
-@@ -77,11 +77,12 @@ class BuildinstallPhase(PhaseBase):
-                 bugurl = data.get('bugurl')
-             if not data.get('nomacboot', True):
-                 nomacboot = False
-+            if "rootfs_size" in data:
-+                rootfs_size = data.get("rootfs_size")
-             add_template.extend(data.get('add_template', []))
-             add_arch_template.extend(data.get('add_arch_template', []))
-             add_template_var.extend(data.get('add_template_var', []))
-             add_arch_template_var.extend(data.get('add_arch_template_var', []))
--            rootfs_size = data.get("rootfs_size")
-         output_dir = os.path.join(output_dir, variant.uid)
-         output_topdir = output_dir
- 
-diff --git a/tests/test_buildinstall.py b/tests/test_buildinstall.py
-index 46ee981d..f8f2c27c 100644
---- a/tests/test_buildinstall.py
-+++ b/tests/test_buildinstall.py
-@@ -251,6 +251,7 @@ class TestBuildinstallPhase(PungiTestCase):
-             'release_is_layered': False,
-             'buildinstall_method': 'lorax',
-             'lorax_options': [
-+                ('^.*$', {'*': {}}),
-                 ('^Server$', {
-                     'x86_64': {
-                         'bugurl': 'http://example.com',
-@@ -265,6 +266,7 @@ class TestBuildinstallPhase(PungiTestCase):
-                 ('^Client$', {
-                     '*': {'nomacboot': False}
-                 }),
-+                ('^.*$', {'*': {}}),
-             ]
-         })
- 
--- 
-2.17.2
-

0001-ostree_installer-Pass-buildarch-to-lorax.patch

@@ -1,55 +0,0 @@
-From da1ea83561aed33efe69516983a3dbd1347da0c6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
-Date: Mon, 28 Jan 2019 13:21:31 +0100
-Subject: [PATCH] ostree_installer: Pass --buildarch to lorax
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This should tell lorax what arch to use and avoids fragile detection
-based on contents of source repo.
-
-It uses the same logic buildinstall phase uses to get the buildarch.
-
-Related: https://pagure.io/teamsilverblue/issue/67
-Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
----
- pungi/phases/ostree_installer.py     | 2 ++
- tests/test_ostree_installer_phase.py | 1 +
- 2 files changed, 3 insertions(+)
-
-diff --git a/pungi/phases/ostree_installer.py b/pungi/phases/ostree_installer.py
-index 587ff2c5..081d23d3 100644
---- a/pungi/phases/ostree_installer.py
-+++ b/pungi/phases/ostree_installer.py
-@@ -9,6 +9,7 @@ from kobo import shortcuts
- 
- from .base import ConfigGuardedPhase, PhaseLoggerMixin
- from .. import util
-+from ..arch import get_valid_arches
- from ..util import get_volid, get_repo_urls, version_generator, translate_path
- from ..wrappers import kojiwrapper, iso, lorax, scm
- 
-@@ -166,6 +167,7 @@ class OstreeInstallerThread(WorkerThread):
-             variant=variant.uid,
-             nomacboot=True,
-             volid=volid,
-+            buildarch=get_valid_arches(arch)[0],
-             buildinstallpackages=config.get('installpkgs'),
-             add_template=self._get_templates(config, 'add_template'),
-             add_arch_template=self._get_templates(config, 'add_arch_template'),
-diff --git a/tests/test_ostree_installer_phase.py b/tests/test_ostree_installer_phase.py
-index 80e68d42..3ab088da 100644
---- a/tests/test_ostree_installer_phase.py
-+++ b/tests/test_ostree_installer_phase.py
-@@ -135,6 +135,7 @@ class OstreeThreadTest(helpers.PungiTestCase):
-         if isfinal:
-             lorax_cmd.append('--isfinal')
- 
-+        lorax_cmd.append("--buildarch=x86_64")
-         lorax_cmd.append('--volid=test-Everything-x86_64')
- 
-         if extra:
--- 
-2.17.2
-

pungi.spec

@@ -1,17 +1,13 @@
 %{?python_enable_dependency_generator}
 
 Name:           pungi
-Version:        4.1.32
+Version:        4.1.33
-Release:        6%{?dist}
+Release:        1%{?dist}
 Summary:        Distribution compose tool
 
 License:        GPLv2
 URL:            https://pagure.io/pungi
 Source0:        https://pagure.io/releases/%{name}/%{name}-%{version}.tar.bz2
-Patch0:         0001-Make-sure-basearch-is-also-replaced-with-config-ostr.patch
-Patch1:         0001-Only-require-enum34-on-Legacy-Python.patch
-Patch2:         0001-ostree_installer-Pass-buildarch-to-lorax.patch
-Patch3:         0001-buildinstall-Pick-correct-config-with-rootfs_size.patch
 
 BuildRequires:  python3-nose
 BuildRequires:  python3-mock
@@ -198,6 +194,25 @@ nosetests-3 --exe
 %{_bindir}/%{name}-wait-for-signed-ostree-handler
 
 %changelog
+* Wed Feb 13 2019 Lubomír Sedlář <lsedlar@redhat.com> - 4.1.33-1
+- isos: Check maximum expected size (lsedlar)
+- osbs: Process data about pushing images to registries (lsedlar)
+- hybrid: Apply filters to debuginfo and source packages (lsedlar)
+- hybrid: Get platform from lookaside repos (lsedlar)
+- Return RPMs added to -devel module in GatherSourceModule. (jkaluza)
+- Allow setting wildcard as a module name in variants to include all the
+  modules. (jkaluza)
+- gather: Link files in order for dependant variants (lsedlar)
+- buildinstall: Pick correct config with rootfs_size (lsedlar)
+- hybrid: Add packages from prepopulate to input (lsedlar)
+- ostree_installer: Pass --buildarch to lorax (lsedlar)
+- orchestrator: Add missing function arguments (lsedlar)
+- orchestrator: Compatibility with Python 2.6 (lsedlar)
+- pungi-legacy: expose lorax's --rootfs-size argument (frederic.pierret)
+- Only require enum34 on Legacy Python (miro)
+- ostree: Add test for expanding basearch for message (lsedlar)
+- Make sure ${basearch} is also replaced with config['ostree_ref'] (patrick)
+
 * Fri Feb 01 2019 Lubomír Sedlář <lsedlar@redhat.com> - 4.1.32-6
 - buildinstall: Pick correct config with rootfs size
 

sources

@@ -1 +1 @@
-SHA512 (pungi-4.1.32.tar.bz2) = ea70bfb53d678ce51bd239d368be0728f5e985e6390e4f5ba78326758bc3767c822fb25fc879b40d88ac3cbaf8d6dfe7d2b9fac44dadafe29534c05b43bf9440
+SHA512 (pungi-4.1.33.tar.bz2) = 48ea55583b1f309da811fc52baba4fd884eebebd7dbc9b8a86dc58569f4503f764e1bc1aec4c8b20fee7b1ed3624ff5a1177760c74247b46fa68183f63c73d1e