New upstream release 4.1.12
This commit is contained in:
Lubomír Sedlář
parent
e0249a029f
commit
b7b404a6e0
|
|
@ -1,90 +0,0 @@
|
|||
From e7e6adfb14c7c0bae7c98454975624c71d1ee1c6 Mon Sep 17 00:00:00 2001
|
||||
From: Colin Walters <walters@verbum.org>
|
||||
Date: Thu, 17 Nov 2016 10:15:03 -0500
|
||||
Subject: [PATCH 1/4] Expose lorax's --rootfs-size argument
|
||||
|
||||
This is going to be necessary for reworking the Atomic Host ISO,
|
||||
see: https://pagure.io/fedora-lorax-templates/pull-request/6
|
||||
|
||||
Signed-off-by: Colin Walters <walters@verbum.org>
|
||||
---
|
||||
doc/configuration.rst | 1 +
|
||||
pungi/checks.py | 1 +
|
||||
pungi/phases/ostree_installer.py | 1 +
|
||||
pungi/wrappers/lorax.py | 4 ++++
|
||||
tests/test_config.py | 1 +
|
||||
5 files changed, 8 insertions(+)
|
||||
|
||||
diff --git a/doc/configuration.rst b/doc/configuration.rst
|
||||
index e22ae44..58be31e 100644
|
||||
--- a/doc/configuration.rst
|
||||
+++ b/doc/configuration.rst
|
||||
@@ -1171,6 +1171,7 @@ an OSTree repository. This always runs in Koji as a ``runroot`` task.
|
||||
* ``add_arch_template`` -- (*[str]*)
|
||||
* ``add_template_var`` -- (*[str]*)
|
||||
* ``add_arch_template_var`` -- (*[str]*)
|
||||
+ * ``rootfs_size`` -- (*[str]*)
|
||||
* ``template_repo`` -- (*str*) Git repository with extra templates.
|
||||
* ``template_branch`` -- (*str*) Branch to use from ``template_repo``.
|
||||
|
||||
diff --git a/pungi/checks.py b/pungi/checks.py
|
||||
index edf7020..be7cfc7 100644
|
||||
--- a/pungi/checks.py
|
||||
+++ b/pungi/checks.py
|
||||
@@ -715,6 +715,7 @@ def _make_schema():
|
||||
"add_arch_template": {"$ref": "#/definitions/list_of_strings"},
|
||||
"add_template_var": {"$ref": "#/definitions/list_of_strings"},
|
||||
"add_arch_template_var": {"$ref": "#/definitions/list_of_strings"},
|
||||
+ "rootfs_size": {"type": "string"},
|
||||
"template_repo": {"type": "string"},
|
||||
"template_branch": {"type": "string"},
|
||||
},
|
||||
diff --git a/pungi/phases/ostree_installer.py b/pungi/phases/ostree_installer.py
|
||||
index 8cde3d7..b07d7a4 100644
|
||||
--- a/pungi/phases/ostree_installer.py
|
||||
+++ b/pungi/phases/ostree_installer.py
|
||||
@@ -152,6 +152,7 @@ class OstreeInstallerThread(WorkerThread):
|
||||
add_arch_template=self._get_templates(config, 'add_arch_template'),
|
||||
add_template_var=config.get('add_template_var'),
|
||||
add_arch_template_var=config.get('add_arch_template_var'),
|
||||
+ rootfs_size=config.get('rootfs_size'),
|
||||
is_final=compose.supported,
|
||||
log_dir=self.logdir,
|
||||
)
|
||||
diff --git a/pungi/wrappers/lorax.py b/pungi/wrappers/lorax.py
|
||||
index 12263fa..50b91c0 100644
|
||||
--- a/pungi/wrappers/lorax.py
|
||||
+++ b/pungi/wrappers/lorax.py
|
||||
@@ -26,6 +26,7 @@ class LoraxWrapper(object):
|
||||
is_final=False, buildarch=None, volid=None, buildinstallpackages=None,
|
||||
add_template=None, add_arch_template=None,
|
||||
add_template_var=None, add_arch_template_var=None,
|
||||
+ rootfs_size=None,
|
||||
log_dir=None):
|
||||
cmd = ["lorax"]
|
||||
cmd.append("--product=%s" % product)
|
||||
@@ -67,6 +68,9 @@ class LoraxWrapper(object):
|
||||
if log_dir:
|
||||
cmd.append('--logfile=%s' % os.path.join(log_dir, 'lorax.log'))
|
||||
|
||||
+ if rootfs_size is not None:
|
||||
+ cmd.append('--rootfs-size=%s' % (rootfs_size))
|
||||
+
|
||||
output_dir = os.path.abspath(output_dir)
|
||||
cmd.append(output_dir)
|
||||
|
||||
diff --git a/tests/test_config.py b/tests/test_config.py
|
||||
index b49b2c1..7f49f5d 100644
|
||||
--- a/tests/test_config.py
|
||||
+++ b/tests/test_config.py
|
||||
@@ -310,6 +310,7 @@ class OstreeInstallerConfigTestCase(unittest.TestCase):
|
||||
"ostree_ref=fedora-atomic/Rawhide/x86_64/docker-host",
|
||||
],
|
||||
"add_arch_template": ["/spin-kickstarts/atomic-installer/lorax-embed-repo.tmpl"],
|
||||
+ "rootfs_size": "3",
|
||||
"add_arch_template_var": [
|
||||
"ostree_repo=https://kojipkgs.fedoraproject.org/compose/atomic/Rawhide/",
|
||||
"ostree_osname=fedora-atomic",
|
||||
--
|
||||
2.9.3
|
||||
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
From ec4fb785e5e68d09b6790963085d33787337ac0d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
|
||||
Date: Thu, 6 Oct 2016 13:12:34 +0200
|
||||
Subject: [PATCH 2/4] ostree-installer: Use dvd-ostree as type in metadata
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
This depends on python-productmd >= 1.3 that understands this format.
|
||||
|
||||
Fixes: #417
|
||||
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
|
||||
---
|
||||
pungi/phases/ostree_installer.py | 2 +-
|
||||
tests/test_ostree_installer_phase.py | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/pungi/phases/ostree_installer.py b/pungi/phases/ostree_installer.py
|
||||
index b07d7a4..5b8d89d 100644
|
||||
--- a/pungi/phases/ostree_installer.py
|
||||
+++ b/pungi/phases/ostree_installer.py
|
||||
@@ -107,7 +107,7 @@ class OstreeInstallerThread(WorkerThread):
|
||||
img.mtime = util.get_mtime(full_iso_path)
|
||||
img.size = util.get_file_size(full_iso_path)
|
||||
img.arch = arch
|
||||
- img.type = "boot"
|
||||
+ img.type = "dvd-ostree"
|
||||
img.format = "iso"
|
||||
img.disc_number = 1
|
||||
img.disc_count = 1
|
||||
diff --git a/tests/test_ostree_installer_phase.py b/tests/test_ostree_installer_phase.py
|
||||
index ad7ee2f..b3e04b6 100644
|
||||
--- a/tests/test_ostree_installer_phase.py
|
||||
+++ b/tests/test_ostree_installer_phase.py
|
||||
@@ -61,7 +61,7 @@ class OstreeThreadTest(helpers.PungiTestCase):
|
||||
self.assertEqual(image.mtime, 13579)
|
||||
self.assertEqual(image.size, 1024)
|
||||
self.assertEqual(image.arch, 'x86_64')
|
||||
- self.assertEqual(image.type, "boot")
|
||||
+ self.assertEqual(image.type, "dvd-ostree")
|
||||
self.assertEqual(image.format, "iso")
|
||||
self.assertEqual(image.disc_number, 1)
|
||||
self.assertEqual(image.disc_count, 1)
|
||||
--
|
||||
2.9.3
|
||||
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
From 364956064eab5e53c7eb4af4ec78888784cfc9d2 Mon Sep 17 00:00:00 2001
|
||||
From: Patrick Uiterwijk <puiterwijk@redhat.com>
|
||||
Date: Tue, 13 Dec 2016 13:48:58 +0000
|
||||
Subject: [PATCH 3/4] Make KojiWrapper parse krb_rdns
|
||||
|
||||
Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
|
||||
---
|
||||
pungi/wrappers/kojiwrapper.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/pungi/wrappers/kojiwrapper.py b/pungi/wrappers/kojiwrapper.py
|
||||
index 85a933a..8dcb5aa 100644
|
||||
--- a/pungi/wrappers/kojiwrapper.py
|
||||
+++ b/pungi/wrappers/kojiwrapper.py
|
||||
@@ -39,7 +39,7 @@ class KojiWrapper(object):
|
||||
for key in ('krbservice', 'timeout', 'keepalive',
|
||||
'max_retries', 'retry_interval', 'anon_retry',
|
||||
'offline_retry', 'offline_retry_interval',
|
||||
- 'debug', 'debug_xmlrpc',
|
||||
+ 'debug', 'debug_xmlrpc', 'krb_rdns',
|
||||
'use_fast_upload'):
|
||||
value = getattr(self.koji_module.config, key, None)
|
||||
if value is not None:
|
||||
--
|
||||
2.9.3
|
||||
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
From c17d72c5e1a73dd7c173ba791710d66b92e73e24 Mon Sep 17 00:00:00 2001
|
||||
From: Patrick Uiterwijk <puiterwijk@redhat.com>
|
||||
Date: Tue, 13 Dec 2016 13:51:48 +0000
|
||||
Subject: [PATCH 4/4] Make KojiWrapper support krb_login with keytab
|
||||
|
||||
Using getattr so we also work with versions of koji that do not
|
||||
read principal and keytab from the config file.
|
||||
|
||||
Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
|
||||
---
|
||||
pungi/wrappers/kojiwrapper.py | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/pungi/wrappers/kojiwrapper.py b/pungi/wrappers/kojiwrapper.py
|
||||
index 8dcb5aa..0dcac90 100644
|
||||
--- a/pungi/wrappers/kojiwrapper.py
|
||||
+++ b/pungi/wrappers/kojiwrapper.py
|
||||
@@ -55,7 +55,9 @@ class KojiWrapper(object):
|
||||
os.path.expanduser(self.koji_module.config.ca),
|
||||
os.path.expanduser(self.koji_module.config.serverca))
|
||||
elif auth_type == 'kerberos':
|
||||
- self.koji_proxy.krb_login()
|
||||
+ self.koji_proxy.krb_login(
|
||||
+ getattr(self.koji_module.config, 'principal', None),
|
||||
+ getattr(self.koji_module.config, 'keytab', None))
|
||||
else:
|
||||
raise RuntimeError('Unsupported authentication type in Koji')
|
||||
|
||||
--
|
||||
2.9.3
|
||||
|
||||
80
pungi.spec
80
pungi.spec
|
|
@ -1,16 +1,12 @@
|
|||
Name: pungi
|
||||
Version: 4.1.11
|
||||
Release: 4%{?dist}
|
||||
Version: 4.1.12
|
||||
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-Expose-lorax-s-rootfs-size-argument.patch
|
||||
Patch1: 0002-ostree-installer-Use-dvd-ostree-as-type-in-metadata.patch
|
||||
Patch2: 0003-Make-KojiWrapper-parse-krb_rdns.patch
|
||||
Patch3: 0004-Make-KojiWrapper-support-krb_login-with-keytab.patch
|
||||
|
||||
BuildRequires: python-nose, python-mock
|
||||
BuildRequires: python-devel, python-setuptools, python2-productmd
|
||||
|
|
@ -26,6 +22,8 @@ BuildRequires: texlive-times, texlive-cmap, texlive-babel-english, texlive-fanc
|
|||
BuildRequires: texlive-fancybox, texlive-titlesec, texlive-framed, texlive-threeparttable
|
||||
BuildRequires: texlive-mdwtools, texlive-wrapfig, texlive-parskip, texlive-upquote
|
||||
BuildRequires: texlive-multirow, texlive-capt-of, texlive-eqparbox, tex(color.cfg)
|
||||
BuildRequires: tex(fncychap.sty)
|
||||
BuildRequires: tex(tabulary.sty)
|
||||
|
||||
Requires: createrepo >= 0.4.11
|
||||
Requires: yum => 3.4.3-28
|
||||
|
|
@ -58,12 +56,18 @@ BuildArch: noarch
|
|||
%description
|
||||
A tool to create anaconda based installation trees/isos of a set of rpms.
|
||||
|
||||
%package utils
|
||||
Summary: Utilities for working with finished composes
|
||||
Requires: pungi = %{version}-%{release}
|
||||
|
||||
%description utils
|
||||
These utilities work with finished composes produced by Pungi. They can be used
|
||||
for creating unified ISO images, validating config file or sending progress
|
||||
notification to Fedora Message Bus.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
|
||||
%build
|
||||
%{__python} setup.py build
|
||||
|
|
@ -90,12 +94,66 @@ cd tests && ./test_compose.sh
|
|||
%doc AUTHORS doc/_build/latex/Pungi.pdf doc/_build/epub/Pungi.epub doc/_build/text/*
|
||||
%{python_sitelib}/%{name}
|
||||
%{python_sitelib}/%{name}-%{version}-py?.?.egg-info
|
||||
%{_bindir}/*
|
||||
%{_bindir}/%{name}
|
||||
%{_bindir}/%{name}-koji
|
||||
%{_bindir}/comps_filter
|
||||
%{_bindir}/%{name}-make-ostree
|
||||
%{_mandir}/man1/pungi.1.gz
|
||||
%{_datadir}/pungi
|
||||
/var/cache/pungi
|
||||
|
||||
%files utils
|
||||
%{python_sitelib}/%{name}_utils
|
||||
%{_bindir}/%{name}-create-unified-isos
|
||||
%{_bindir}/%{name}-config-validate
|
||||
%{_bindir}/%{name}-fedmsg-notification
|
||||
|
||||
%changelog
|
||||
* Tue Jan 17 2017 Lubomír Sedlář <lsedlar@redhat.com> - 4.1.12-1
|
||||
- unified-iso: Fall back to default config (lsedlar)
|
||||
- osbs: optionally check GPG signatures (qwan)
|
||||
- ostree-installer: Allow multiple repos in ostree installer (qwan)
|
||||
- Update tox.ini (lsedlar)
|
||||
- unified-iso: Create isos with debuginfo packages (lsedlar)
|
||||
- Create temporary dirs under compose's workdir (qwan)
|
||||
- spec: Update upstream and source URL (lsedlar)
|
||||
- unified-iso: Create work/ dir if missing (lsedlar)
|
||||
- spec: Copy %%check section from Fedora (lsedlar)
|
||||
- Update MANIFEST.in to include test data (lsedlar)
|
||||
- osbs: Add better example to documentation (lsedlar)
|
||||
- metadata: Correctly parse lorax .treeinfo (lsedlar)
|
||||
- spec: Add a separate subpackage for extra utils (lsedlar)
|
||||
- Add script to generate unified ISOs (lsedlar)
|
||||
- osbs: Validate config in tests (lsedlar)
|
||||
- osbs: Verify the .repo files contain correct URL (lsedlar)
|
||||
- osbs: Enable specifying extra repos (lsedlar)
|
||||
- pungi-make-ostree: change 'tree' command '--log-dir' arg to be required
|
||||
(qwan)
|
||||
- Add test for krb_login with principal and keytab (puiterwijk)
|
||||
- Make sure that the profile name is parsed correctly (puiterwijk)
|
||||
- Make KojiWrapper support krb_login with keytab (puiterwijk)
|
||||
- Make KojiWrapper parse krb_rdns (puiterwijk)
|
||||
- Update documentation (lsedlar)
|
||||
- image-build: Allow failure only on some arches (lsedlar)
|
||||
- live-media: Allow some arches to fail (lsedlar)
|
||||
- image-build: Use install_tree from parent for nested variants (lsedlar)
|
||||
- config: Report unknown options as warnings (lsedlar)
|
||||
- pungi: Fix --nosource option (lsedlar)
|
||||
- pungi: Handle missing SRPM (lsedlar)
|
||||
- ostree-installer: Add 'installer' sub-command to pungi-make-ostree (qwan)
|
||||
- ostree: Add 'tree' sub-command to pungi-make-ostree script (qwan)
|
||||
- metadata: Allow creating internal releases (lsedlar)
|
||||
- Add CLI option to create ci compose (lsedlar)
|
||||
- Fix PhaseLoggerMixin in case of compose has _logger = None (qwan)
|
||||
- ostree-installer: Use dvd-ostree as type in metadata (lsedlar)
|
||||
- image-build: Reduce duplication (lsedlar)
|
||||
- createrepo: Add tests for adding product certificates (lsedlar)
|
||||
- createrepo: Add tests for retrieving product certificates (lsedlar)
|
||||
- Include phase name in log for some phases (qwan)
|
||||
- Expose lorax's --rootfs-size argument (walters)
|
||||
- pungi: Include noarch debuginfo (lsedlar)
|
||||
- media-split: Print sensible message for unlimited size (lsedlar)
|
||||
|
||||
* Wed Dec 14 2016 Lubomír Sedlář <lsedlar@redhat.com> - 4.1.11-4
|
||||
- Add patches for koji kerberos auth
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue