From a2b16eb44f303b634bc9890a37e3da1afc46d326 Mon Sep 17 00:00:00 2001 From: soksanichenko Date: Mon, 7 Nov 2022 23:33:03 +0200 Subject: [PATCH] - spec is updated (merged with last changed from Fedora repo https://src.fedoraproject.org/rpms/pungi/blob/main/f/pungi.spec --- pungi.spec | 214 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 201 insertions(+), 13 deletions(-) diff --git a/pungi.spec b/pungi.spec index a26a4a75..acab62f9 100644 --- a/pungi.spec +++ b/pungi.spec @@ -1,14 +1,15 @@ %{?python_enable_dependency_generator} Name: pungi -Version: 4.2.17 -Release: 1%{?dist} +Version: 4.3.6 +Release: 2%{?dist} Summary: Distribution compose tool License: GPLv2 URL: https://pagure.io/pungi Source0: %{name}-%{version}.tar.bz2 +BuildRequires: make BuildRequires: python3-nose BuildRequires: python3-pytest BuildRequires: python3-mock @@ -33,7 +34,7 @@ BuildRequires: python3-kobo BuildRequires: python3-koji BuildRequires: lorax BuildRequires: python3-PyYAML -BuildRequires: libmodulemd >= 2.8.0 +BuildRequires: python3-libmodulemd >= 2.8.0 BuildRequires: python3-gobject BuildRequires: python3-createrepo_c >= 0.20.1 BuildRequires: python3-dogpile-cache @@ -59,10 +60,11 @@ Requires: python3-dnf Requires: python3-multilib Requires: python3-libcomps Requires: python3-koji -Requires: libmodulemd >= 2.8.0 +Requires: python3-libmodulemd >= 2.8.0 Requires: python3-gobject Requires: python3-createrepo_c >= 0.20.1 Requires: python3-PyYAML +Requires: python3-productmd >= 1.28R Requires: python3-gobject-base Requires: lorax @@ -80,7 +82,7 @@ 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} -# Requires: python3-fedmsg +Requires: python3-fedmsg %description utils These utilities work with finished composes produced by Pungi. They can be used @@ -110,21 +112,16 @@ gzip _build/man/pungi.1 %install %py3_install -%{__install} -d %{buildroot}/var/cache/pungi +%{__install} -d %{buildroot}/var/cache/pungi/createrepo_c %{__install} -d %{buildroot}%{_mandir}/man1 %{__install} -m 0644 doc/_build/man/pungi.1.gz %{buildroot}%{_mandir}/man1 rm %{buildroot}%{_bindir}/pungi -# CLOUDLINUX: We don't need fedmsg stuff rm %{buildroot}%{_bindir}/%{name}-fedmsg-notification %check -python3 -m pytest -# master branch part of %check segment. Currently it doesn't work -# because of pungi-koji requirement in bash tests -#./tests/data/specs/build.sh -#cd tests && ./test_compose.sh +%pytest %files %license COPYING GPL @@ -141,6 +138,7 @@ python3 -m pytest %{_mandir}/man1/pungi.1.gz %{_datadir}/pungi /var/cache/pungi +%dir %attr(1777, root, root) /var/cache/pungi/createrepo_c %files -n python3-%{name} %{python3_sitelib}/%{name} @@ -151,7 +149,7 @@ python3 -m pytest %{_bindir}/%{name}-create-unified-isos %{_bindir}/%{name}-config-dump %{_bindir}/%{name}-config-validate -# %{_bindir}/%{name}-fedmsg-notification +%{_bindir}/%{name}-fedmsg-notification %{_bindir}/%{name}-notification-report-progress %{_bindir}/%{name}-orchestrate %{_bindir}/%{name}-patch-iso @@ -161,13 +159,96 @@ python3 -m pytest %changelog +* Mon Nov 07 2022 Lubomír Sedlář - 4.3.6-2 +- Stop including comps in modular repos + * Wed Oct 19 2022 stepan_oksanichenko - 4.2.17-1 - Replace list of cr.packages by cr.PackageIterator in package JSON generator - Do not lose a module from koji if we have more than one arch (e.g. x86_64 + i686) +* Fri Aug 26 2022 Lubomír Sedlář - 4.3.6-1 +- pkgset: Report better error when module is missing an arch (lsedlar) +- osbuild: add support for building ostree artifacts (ondrej) +- ostree: Add unified core mode for compose in rpm-ostree (tim) +- createiso: Make ISO level more granular (lsedlar) +- Create DVDs with xorriso (lsedlar) +- Fix compatibility with jsonschema >= 4.0.0 (lsedlar) +- Fix black complaint (lsedlar) +- doc: fix osbuild's image_types field name (ondrej) +- Convert _ssh_run output to str for python3 (hlin) +- Print more logs for git_ls_remote (hlin) +- Log time taken of each phase (hlin) +- Avoid crash when loading pickle file failed (hlin) +- extra_isos: Fix detection of changed packages (lsedlar) + +* Thu Aug 11 2022 Lubomír Sedlář - 4.3.5-8 +- Backport jsonschema compatibility patch (rhbz#2113607) + +* Mon Jul 25 2022 Lubomír Sedlář - 4.3.5-7 +- Update xorriso patch + +* Fri Jul 22 2022 Fedora Release Engineering - 4.3.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 20 2022 Python Maint - 4.3.5-5 +- Rebuilt for Python 3.11 + +* Thu Jun 16 2022 Adam Williamson - 4.3.5-4 +- Don't try and run isohybrid when using xorriso + +* Wed Jun 15 2022 Python Maint - 4.3.5-3 +- Rebuilt for Python 3.11 + +* Wed Jun 15 2022 Lubomír Sedlář - 4.3.5-2 +- Backport patch for building DVDs with xorriso command again + +* Wed Jun 15 2022 Lubomír Sedlář - 4.3.5-1 +- Fix module defaults and obsoletes validation (mkulik) +- Update the cts_keytab field in order to get the hostname of the server + (ounsal) +- Add skip_branding to ostree_installer. (lzhuang) +- kojiwrapper: Ignore warnings before task id (lsedlar) +- Restrict jsonschema version (lsedlar) +- Revert "Do not clone the same repository multiple times, re-use already + cloned repository" (hlin) +- Involve bandit (hlin) + +* Wed Jun 08 2022 Lubomír Sedlář - 4.3.4-2 +- Backport patch for building DVDs with xorriso command + * Wed May 4 2022 stepan_oksanichenko - 4.2.16-1 - ALBS-334: Make the ability of Pungi to give module_defaults from remote sources +* Mon Apr 04 2022 Ondřej Nosek - 4.3.4-1 +- kojiwrapper: Add retries to login call (lsedlar) +- Variants file in config can contain path (onosek) +- nomacboot option for livemedia koji tasks (cobrien) +- doc: improve osbs_registries explanation (kdreyer) +- osbs: only handle archives of type "image" (kdreyer) +- Update the default greedy_method value in doc (ounsal) +- Fix the wrong working directory for the progress_notification script (ounsal) +- Filter out environment groups unmatch given arch (hlin) +- profiler: Respect provided output stream (lsedlar) +- modules: Correct a typo in loading obsoletes (ppisar) +- Do not clone the same repository multiple times, re-use already cloned + repository (ounsal) + +* Fri Feb 04 2022 Lubomír Sedlář - 4.3.3-3 +- Backport typo fix + +* Fri Jan 21 2022 Fedora Release Engineering - 4.3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jan 14 2022 Haibo Lin - 4.3.3-1 +- hybrid: Explicitly pull in debugsource packages (lsedlar) +- Add module obsoletes feature (fvalder) +- buildinstall: Add ability to install extra packages in runroot (ounsal) +- Ignore osbs/osbuild config when reusing iso images (hlin) +- compose: Make sure temporary dirs are world readable (lsedlar) +- Pass compose parameter for debugging git issue (hlin) +- Generate images.json for extra_isos phase (hlin) +- Fix tests for python 2.6 (hlin) + * Thu Dec 30 2021 stepan_oksanichenio - 4.2.15-1 - ALBS-97: The scripts `gather_modules` and `generate_packages_json` support LZMA compression - ALBS-97: The script `generate_packages_json` can use repos with different architectures @@ -175,21 +256,116 @@ python3 -m pytest * Mon Dec 20 2021 stepan_oksanichenko - 4.2.14-1 - ALBS-66: The generator of packages JSON can process the same packages with different versions +* Mon Nov 15 2021 Haibo Lin - 4.3.2-2 +- Backport patch for generating images.json + +* Thu Nov 11 2021 Haibo Lin - 4.3.2-1 +- gather: Load JSON mapping relative to config dir (lsedlar) +- gather: Stop requiring all variants/arches in JSON (lsedlar) +- doc: make dnf "backend" settings easier to discover (kdreyer) +- Remove with_jigdo argument (lsedlar) +- Check dependencies after config validation (lsedlar) +- default "with_jigdo" to False (kdreyer) +- Stop trying to validate non-existent metadata (lsedlar) +- test images for metadata deserialization error (fdipretre) +- repoclosure: Use --forcearch for dnf repoclosure (lsedlar) +- extra_isos: Allow reusing old images (lsedlar) +- createiso: Allow reusing old images (lsedlar) +- Remove default runroot channel (lsedlar) + +* Tue Oct 26 2021 Lubomír Sedlář - 4.3.1-1 +- Correct irc network name & add matrix room (dan.cermak) +- Add missing mock to osbs tests (lsedlar) +- osbs: Reuse images from old compose (hlin) +- image_build: Allow reusing old image_build results (hlin) +- Allow ISO-Level configuration within the config file (ounsal) +- Work around ODCS creating COMPOSE_ID later (lsedlar) +- When `cts_url` is configured, use CTS `/repo` API for buildContainer + yum_repourls. (jkaluza) +- Add COMPOSE_ID into the pungi log file (ounsal) +- buildinstall: Add easy way to check if previous result was reused (lsedlar) + +* Mon Oct 04 2021 Lubomír Sedlář - 4.3.0-2 +- Backport patch to avoid crash on missing COMPOSE_ID + +* Wed Sep 15 2021 Lubomír Sedlář - 4.3.0-1 +- Only build CTS url when configured (lsedlar) +- Require requests_kerberos only when needed (lsedlar) +- Allow specifying $COMPOSE_ID in the `repo` value for osbs phase. (jkaluza) +- Make getting old compose config reusable (lsedlar) +- paths: Allow customizing log file extension (lsedlar) +- Add authentication for updating the compose URL in CTS. (ounsal) +- Fix type detection for osbuild images (lsedlar) +- Enable pungi to send compose_url patches to CTS (ounsal) +- Use xorriso instead of isoinfo when createiso_use_xorrisofs is enabled + (ounsal) +- Fix tests for createrepo (drumian) +- Formatted files according to flake8 and black feedback (drumian) +- Handle the pungi failures to ensure creation of log files (ounsal) +- Add createrepo_enable_cache to configuration doc (hlin) +- Fix formatting (hlin) +- Install missing deps in ci image (hlin) +- Use pytest directly incl. support for posargs, e.g.: tox -- -s -vvv + tests/path/to/a/single/test_something.py (fvalder) +- Supersede ModuleStream loading with ModuleIndex (fvalder) +- Better error message than 'KeyError' in pungi (drumian) +- Adding multithreading support for pungi/phases/image_checksum.py (jkunstle) +- doc: more additional_packages documentation (kdreyer) +- doc: fix typo in additional_packages description (kdreyer) +- doc: improve signed packages retry docs (kdreyer) +- Better error message than 'KeyError' in pungi (drumian) +- doc: explain buildContainer API (kdreyer) + +* Wed Aug 04 2021 Haibo Lin - 4.2.10-1 +- Show and log command when using the run_blocking_cmd() method (fdipretre) +- Use cachedir when createrepo (hlin) +- gather: Add all srpms to variant lookaside repo (lsedlar) +- Add task URL to watch task log (hlin) +- Log warning when module defined in variants.xml not found (hlin) +- pkgset: Compare future events correctly (lsedlar) +- util: Strip file:// from local urls (lsedlar) +- Clean up temporary yumroot dir (hlin) + +* Fri Jul 23 2021 Fedora Release Engineering - 4.2.9-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Jun 18 2021 stepan_oksanichenko - 4.2.13-1 - LNX-326: Add the ability to include any package by mask in packages.json to the generator - LNX-318: Modify build scripts for building CloudLinux OS 8.4 +* Fri Jun 04 2021 Python Maint - 4.2.9-2 +- Rebuilt for Python 3.10 + * Tue May 25 2021 Stepan Oksanichenko - 4.2.12-1 - LNX-108: Add multiarch support to pungi * Thu Apr 29 2021 Stepan Oksanichenko - 4.2.11-1 - LNX-311: Add ability to productmd set a main variant while dumping TreeInfo +* Thu Apr 29 2021 onosek - 4.2.9-1 +- New upstream release 4.2.9 +- Fix can't link XDEV using repos as pkgset_sources (romain.forlot) +- Updated the deprecated ks argument name (to the current inst.ks) (lveyde) +- gather: Adjust reusing with lookaside (hlin) +- hybrid: Optimize getting lookaside packages (lsedlar) +- gather: Copy old logs when reusing gather result (hlin) +- Cancel koji tasks when pungi terminated (hlin) +- Add Dockerfile for building testing image (hlin) +- image_container: Fix incorrect arch processing (lsedlar) +- runroot: Adjust permissions always (hlin) +- Format code (hlin) +- pkgset: Fix meaning of retries (lsedlar) +- pkgset: Store module tag only if module is used (lsedlar) +- Store extended traceback for gather errors (lsedlar) + * Wed Feb 24 2021 Danylo Kuropiatnyk , Stepan Oksanichenko - 4.2.10-1 - LU-2186 .treeinfo file in AlmaLinux public kickstart repo should contain AppStream variant - LU-2195 Change path to sources and iso when generating repositories - LU-2202: Start unittests during installation or build of pungi +* Fri Feb 12 2021 Ondrej Nosek - 4.2.8-1 +- New upstream version + * Thu Feb 11 2021 Stepan Oksanichenko - 4.2.9-1 - LNX-133: Create a server for building nightly builds of AlmaLinux - LU-2133: Prepare CI for iso builds of CLOSS 8 @@ -202,6 +378,18 @@ python3 -m pytest - LNX-102: Add tool that collects information about modules - LNX-103 Update .spec file for AlmaLinux +* Wed Jan 27 2021 Fedora Release Engineering - 4.2.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Jan 22 2021 Lubomír Sedlář - 4.2.7-2 +- Backport patch for preserving default attribute in comps + +* Tue Dec 8 09:01:52 CET 2020 Lubomír Sedlář - 4.2.7-1 +- New upstream version + +* Thu Nov 05 2020 Lubomír Sedlář - 4.2.6-1 +- New upstream release + * Fri Sep 25 2020 Lubomír Sedlář - 4.2.5-1 - New upstream release