diff --git a/0001-Revert-Move-ostree-phase-and-pipelines-for-running-p.patch b/0001-Revert-Move-ostree-phase-and-pipelines-for-running-p.patch index b38c4037..098b3140 100644 --- a/0001-Revert-Move-ostree-phase-and-pipelines-for-running-p.patch +++ b/0001-Revert-Move-ostree-phase-and-pipelines-for-running-p.patch @@ -1,4 +1,4 @@ -From 36a88c877baa0be5ff3318ddcf9b97cf2057d748 Mon Sep 17 00:00:00 2001 +From 9f3201908a6edc5d559e02b98060ba9781d99114 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Wed, 11 Apr 2018 09:18:59 +0200 Subject: [PATCH 1/3] Revert "Move ostree phase and pipelines for running @@ -6,11 +6,11 @@ Subject: [PATCH 1/3] Revert "Move ostree phase and pipelines for running This reverts commit 660c04368ba1abed310f121d01f0fa029eea5f11. --- - bin/pungi-koji | 54 +++++++++------- - doc/_static/phases.svg | 162 +++++++++++++++++++++++++++++++++++------------ - pungi/phases/__init__.py | 19 +++++- - pungi/phases/weaver.py | 72 --------------------- - tests/test_phase_base.py | 129 ++++++++----------------------------- + bin/pungi-koji | 54 +++++++------ + doc/_static/phases.svg | 162 +++++++++++++++++++++++++++++---------- + pungi/phases/__init__.py | 19 ++++- + pungi/phases/weaver.py | 72 ----------------- + tests/test_phase_base.py | 129 +++++++------------------------ 5 files changed, 198 insertions(+), 238 deletions(-) delete mode 100644 pungi/phases/weaver.py @@ -615,5 +615,5 @@ index ba80afe3..a8b9469a 100644 if __name__ == "__main__": -- -2.14.4 +2.17.1 diff --git a/0002-Revert-Other-repo-for-OstreeInstaller.patch b/0002-Revert-Other-repo-for-OstreeInstaller.patch index cf527496..e5f1714f 100644 --- a/0002-Revert-Other-repo-for-OstreeInstaller.patch +++ b/0002-Revert-Other-repo-for-OstreeInstaller.patch @@ -1,4 +1,4 @@ -From 208c5e88a14a0caea8180b5958d41ffd5f046bc6 Mon Sep 17 00:00:00 2001 +From 2fffbaf2b09a44e85a597e45bb258e3bcb98743f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Wed, 11 Apr 2018 09:19:53 +0200 Subject: [PATCH 2/3] Revert "Other repo for OstreeInstaller" @@ -6,16 +6,16 @@ Subject: [PATCH 2/3] Revert "Other repo for OstreeInstaller" This reverts commit 5c081cb545715c2a912ff50fa57554e89d905868. --- pungi/checks.py | 3 +- - pungi/phases/ostree_installer.py | 18 ++---------- - pungi/util.py | 21 ++++---------- - tests/test_ostree_installer_phase.py | 54 +++++++++++++----------------------- + pungi/phases/ostree_installer.py | 18 ++-------- + pungi/util.py | 21 ++++------- + tests/test_ostree_installer_phase.py | 54 ++++++++++------------------ 4 files changed, 29 insertions(+), 67 deletions(-) diff --git a/pungi/checks.py b/pungi/checks.py -index 53fc615e..35390022 100644 +index 7a2f9a8d..673b3666 100644 --- a/pungi/checks.py +++ b/pungi/checks.py -@@ -1020,7 +1020,7 @@ def make_schema(): +@@ -1030,7 +1030,7 @@ def make_schema(): "tag_ref": {"type": "boolean"}, "ostree_ref": {"type": "string"}, }, @@ -24,7 +24,7 @@ index 53fc615e..35390022 100644 "additionalProperties": False, }), ] -@@ -1041,6 +1041,7 @@ def make_schema(): +@@ -1051,6 +1051,7 @@ def make_schema(): "template_repo": {"type": "string"}, "template_branch": {"type": "string"}, }, @@ -69,7 +69,7 @@ index 587ff2c5..861d9db1 100644 output_dir = os.path.join(compose.paths.work.topdir(arch), variant.uid, 'ostree_installer') util.makedirs(os.path.dirname(output_dir)) diff --git a/pungi/util.py b/pungi/util.py -index 65f3fe61..f878febe 100644 +index 3a31ca87..37b4d5f5 100644 --- a/pungi/util.py +++ b/pungi/util.py @@ -691,8 +691,6 @@ def get_repo_url(compose, repo, arch='$basearch'): @@ -305,5 +305,5 @@ index 80e68d42..459ae063 100644 isfinal=True, extra=['--installpkgs=fedora-productimg-atomic', -- -2.14.4 +2.17.1 diff --git a/0003-Revert-Ostree-can-use-pkgset-repos.patch b/0003-Revert-Ostree-can-use-pkgset-repos.patch index 61220dd5..5fd41565 100644 --- a/0003-Revert-Ostree-can-use-pkgset-repos.patch +++ b/0003-Revert-Ostree-can-use-pkgset-repos.patch @@ -1,15 +1,15 @@ -From 1fc1fe8a84417d213a9ed6f787c3a61e0f859df5 Mon Sep 17 00:00:00 2001 +From 625183a5a3c35c68184b5da8166775de691e6d61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Wed, 11 Apr 2018 09:20:51 +0200 Subject: [PATCH 3/3] Revert "Ostree can use pkgset repos" This reverts commit c7cc200246300c6a3946b2e3a9f5f7693896a7d6. --- - pungi/phases/ostree.py | 7 +---- - pungi/util.py | 35 +++++++++++++----------- + pungi/phases/ostree.py | 7 +--- + pungi/util.py | 35 +++++++++++-------- tests/test_config_validate_script.py | 4 ++- - tests/test_ostree_phase.py | 52 +++++++----------------------------- - tests/test_util.py | 26 +++++++++++------- + tests/test_ostree_phase.py | 52 +++++----------------------- + tests/test_util.py | 26 +++++++++----- 5 files changed, 50 insertions(+), 74 deletions(-) diff --git a/pungi/phases/ostree.py b/pungi/phases/ostree.py @@ -31,7 +31,7 @@ index 2918fff8..0550b18c 100644 # copy the original config and update before save to a json file new_config = copy.copy(config) diff --git a/pungi/util.py b/pungi/util.py -index f878febe..d8eac880 100644 +index 37b4d5f5..1a95e1f4 100644 --- a/pungi/util.py +++ b/pungi/util.py @@ -731,16 +731,19 @@ def _translate_url_to_repo_id(url): @@ -283,5 +283,5 @@ index 9e247cde..2b93e496 100644 -- -2.14.4 +2.17.1 diff --git a/pungi.spec b/pungi.spec index e8df35ae..59012337 100644 --- a/pungi.spec +++ b/pungi.spec @@ -1,5 +1,5 @@ Name: pungi -Version: 4.1.27 +Version: 4.1.28 Release: 1%{?dist} Summary: Distribution compose tool @@ -38,6 +38,7 @@ BuildRequires: libmodulemd >= 1.3.0 BuildRequires: python3-gobject BuildRequires: python3-pdc-client BuildRequires: python3-createrepo_c +BuildRequires: python3-dogpile-cache #deps for doc building BuildRequires: python3-sphinx, texlive-collection-fontsrecommended @@ -74,6 +75,7 @@ Requires: python3-gobject Requires: python3-pdc-client Requires: python3-createrepo_c Requires: python3-PyYAML +Requires: python3-dogpile-cache Requires: python3-%{name} = %{version}-%{release} @@ -180,6 +182,26 @@ nosetests-3 --exe %{_bindir}/%{name}-wait-for-signed-ostree-handler %changelog +* Thu Sep 06 2018 Lubomír Sedlář - 4.1.28-1 +- gather: Fix multilib query for hybrid solver (lsedlar) +- gather: Expand multilib lists for hybrid method (lsedlar) +- Index arch modulemd by full NSVC (lsedlar) +- pkgset: Apply whitelist to modules in the tag (lsedlar) +- ostree: Wait for updated ref as well as signature (lsedlar) +- extra_iso: Set unified flag in metadata (lsedlar) +- pkgset: Respect koji event when searching for modules (lsedlar) +- Use dogpile.cache to cache the listTaggedRPMS calls if possible (jkaluza) +- gather: Keep original rpms.json in debug mode (lsedlar) +- Reduce duplication in tests (lsedlar) +- docs: Add better description for package globs (lsedlar) +- Create non-bootable ISO for variant without buildinstall (lsedlar) +- Clean up after yum tests (lsedlar) +- gather: Honor module whitelist (lsedlar) +- Clarify error about non-existing module (lsedlar) +- gather: Print full unresolved dependency (lsedlar) +- Fix tests on Python 2.6 (lsedlar) +- Include all test data in tarball (lsedlar) + * Fri Aug 17 2018 Lubomír Sedlář - 4.1.27-1 - extra-iso: Rename test data file (lsedlar) - createiso: Use correct python version (lsedlar) diff --git a/sources b/sources index d22075b2..de66f003 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pungi-4.1.27.tar.bz2) = 110da14aec38fba0c6b07a843fc6c67e261d06258cfea291f513736d489f3a4a16d7144c5dd8986ed8d36d2b8022ae9f78fd5f07e8cde1a13ea6aacf636c3b8e +SHA512 (pungi-4.1.28.tar.bz2) = eea070d5df9b5d5b50bd8b51e4e5ebca65b915af5d6032e86d30ca984c31361ee1ddcf917acaf96f0319d965d27e02718c06329c6e0191f177ac51db340ae87e