From 4c604f434a938ccaa4aec958fe656b1fea15c001 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Tue, 25 Jul 2023 11:21:27 +0200 Subject: [PATCH] Release 4.4.1 --- 1671.patch | 28 ---------------------------- 1690.patch | 53 ----------------------------------------------------- pungi.spec | 11 ++++++++--- sources | 2 +- 4 files changed, 9 insertions(+), 85 deletions(-) delete mode 100644 1671.patch delete mode 100644 1690.patch diff --git a/1671.patch b/1671.patch deleted file mode 100644 index 6204f3e2..00000000 --- a/1671.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b8b6b46ce7df2b80be110dd93cc795eb47a78549 Mon Sep 17 00:00:00 2001 -From: Aurélien Bompard -Date: May 03 2023 12:20:57 +0000 -Subject: Set the priority in the fedora-messaging notifier - - -According to [infra ticket #10899](https://pagure.io/fedora-infrastructure/issue/10899), -ostree messages should have prioriy 3. - -Signed-off-by: Aurélien Bompard - ---- - -diff --git a/pungi/scripts/fedmsg_notification.py b/pungi/scripts/fedmsg_notification.py -index db5dc01..e2c05c5 100644 ---- a/pungi/scripts/fedmsg_notification.py -+++ b/pungi/scripts/fedmsg_notification.py -@@ -14,6 +14,9 @@ def send(cmd, data): - topic = "compose.%s" % cmd.replace("-", ".").lower() - try: - msg = fedora_messaging.api.Message(topic="pungi.{}".format(topic), body=data) -+ if cmd == "ostree": -+ # https://pagure.io/fedora-infrastructure/issue/10899 -+ msg.priority = 3 - fedora_messaging.api.publish(msg) - except fedora_messaging.exceptions.PublishReturned as e: - print("Fedora Messaging broker rejected message %s: %s" % (msg.id, e)) - diff --git a/1690.patch b/1690.patch deleted file mode 100644 index a76d2fbe..00000000 --- a/1690.patch +++ /dev/null @@ -1,53 +0,0 @@ -From bd64894a03628d52be8cbe89b79ef724293d2053 Mon Sep 17 00:00:00 2001 -From: Lubomír Sedlář -Date: Jul 18 2023 06:44:26 +0000 -Subject: ostree: Add configuration for custom runroot packages - - -Signed-off-by: Lubomír Sedlář - ---- - -diff --git a/doc/configuration.rst b/doc/configuration.rst -index 3912e47..70a0534 100644 ---- a/doc/configuration.rst -+++ b/doc/configuration.rst -@@ -1800,6 +1800,8 @@ repository with a new commit. - * ``tag_ref`` -- (*bool*, default ``True``) If set to ``False``, a git - reference will not be created. - * ``ostree_ref`` -- (*str*) To override value ``ref`` from ``treefile``. -+ * ``runroot_packages`` -- (*list*) A list of additional package names to be -+ installed in the runroot environment in Koji. - - Example config - -------------- -diff --git a/pungi/checks.py b/pungi/checks.py -index c5ef3f8..3bd334e 100644 ---- a/pungi/checks.py -+++ b/pungi/checks.py -@@ -1059,6 +1059,9 @@ def make_schema(): - "config_branch": {"type": "string"}, - "tag_ref": {"type": "boolean"}, - "ostree_ref": {"type": "string"}, -+ "runroot_packages": { -+ "$ref": "#/definitions/list_of_strings", -+ }, - }, - "required": [ - "treefile", -diff --git a/pungi/phases/ostree.py b/pungi/phases/ostree.py -index cbfcd76..90578ae 100644 ---- a/pungi/phases/ostree.py -+++ b/pungi/phases/ostree.py -@@ -168,7 +168,9 @@ class OSTreeThread(WorkerThread): - ("unified-core", config.get("unified_core", False)), - ] - ) -- packages = ["pungi", "ostree", "rpm-ostree"] -+ default_packages = ["pungi", "ostree", "rpm-ostree"] -+ additional_packages = config.get("runroot_packages", []) -+ packages = default_packages + additional_packages - log_file = os.path.join(self.logdir, "runroot.log") - mounts = [compose.topdir, config["ostree_repo"]] - runroot = Runroot(compose, phase="ostree") - diff --git a/pungi.spec b/pungi.spec index 942987ee..bc71de9b 100644 --- a/pungi.spec +++ b/pungi.spec @@ -1,14 +1,13 @@ %{?python_enable_dependency_generator} Name: pungi -Version: 4.4.0 -Release: 4%{?dist} +Version: 4.4.1 +Release: 1%{?dist} Summary: Distribution compose tool License: GPL-2.0-only URL: https://pagure.io/pungi Source0: https://pagure.io/releases/%{name}/%{name}-%{version}.tar.bz2 -Patch0: https://pagure.io/pungi/pull-request/1690.patch BuildRequires: make BuildRequires: python3-pytest @@ -139,6 +138,12 @@ rm %{buildroot}%{_bindir}/pungi %{_bindir}/%{name}-wait-for-signed-ostree-handler %changelog +* Tue Jul 25 2023 Lubomír Sedlář - 4.4.1-1 +- ostree: Add configuration for custom runroot packages (lsedlar) +- pkgset: Emit better error for missing modulemd file (lsedlar) +- Add support for git-credential-helper (lsedlar) +- Support OIDC Client Credentials authentication to CTS (hlin) + * Fri Jul 21 2023 Fedora Release Engineering - 4.4.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 5046a97f..624bf60a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pungi-4.4.0.tar.bz2) = 757d06f1722dca38883da8c368a42eef1095fd7645e981335b661843bb1296e692219ecc26c847fd9a662b0a6fc08713bd53a55f4d84534f599ab614a24e5500 +SHA512 (pungi-4.4.1.tar.bz2) = 3c6f435afbe01c55e48df4b4e659c30870c32aca1b04b4b85ae8066cb36f0df704ef391cdedf8bff6fd13d837f20f80399485873b9b5d8efa967f39951ce3806