Release 4.4.1

(cherry picked from commit 4c604f434a (fedora_master))
This commit is contained in:
Lubomír Sedlář 2023-07-25 12:21:27 +03:00 committed by Stepan Oksanichenko
parent d7b5fd2278
commit 8fe0257e93
Signed by: soksanichenko
GPG Key ID: AB9983172AB1E45B
3 changed files with 11 additions and 86 deletions

View File

@ -1,28 +0,0 @@
From b8b6b46ce7df2b80be110dd93cc795eb47a78549 Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
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 <aurelien@bompard.org>
---
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))

View File

@ -1,53 +0,0 @@
From bd64894a03628d52be8cbe89b79ef724293d2053 Mon Sep 17 00:00:00 2001
From: Lubomír Sedlář <lsedlar@redhat.com>
Date: Jul 18 2023 06:44:26 +0000
Subject: ostree: Add configuration for custom runroot packages
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
---
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")

View File

@ -1,14 +1,13 @@
%{?python_enable_dependency_generator} %{?python_enable_dependency_generator}
Name: pungi Name: pungi
Version: 4.4.0 Version: 4.4.1
Release: 4%{?dist}.alma Release: 1%{?dist}.alma
Summary: Distribution compose tool Summary: Distribution compose tool
License: GPL-2.0-only License: GPL-2.0-only
URL: https://pagure.io/pungi URL: https://pagure.io/pungi
Source0: %{name}-%{version}.tar.bz2 Source0: %{name}-%{version}.tar.bz2
Patch0: 1690.patch
BuildRequires: make BuildRequires: make
BuildRequires: python3-pytest BuildRequires: python3-pytest
@ -162,8 +161,12 @@ rm %{buildroot}%{_bindir}/pungi
%{_bindir}/%{name}-wait-for-signed-ostree-handler %{_bindir}/%{name}-wait-for-signed-ostree-handler
%changelog %changelog
* Tue Jul 25 2023 Stepan Oksanichenko <soksanichenko@cloudlinux.com> - 4.3.7-8
- Option `excluded-packages` for script `pungi-gather-rpms` * Tue Jul 25 2023 Lubomír Sedlář <lsedlar@redhat.com> - 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 <releng@fedoraproject.org> - 4.4.0-4 * Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
@ -197,6 +200,9 @@ rm %{buildroot}%{_bindir}/pungi
* Wed May 03 2023 Lubomír Sedlář <lsedlar@redhat.com> - 4.3.8-1 * Wed May 03 2023 Lubomír Sedlář <lsedlar@redhat.com> - 4.3.8-1
- Set priority for Fedora messages - Set priority for Fedora messages
* Tue Jul 25 2023 Stepan Oksanichenko <soksanichenko@cloudlinux.com> - 4.3.7-8
- Option `excluded-packages` for script `pungi-gather-rpms`
* Thu Apr 13 2023 Stepan Oksanichenko <soksanichenko@cloudlinux.com> - 4.3.7-7 * Thu Apr 13 2023 Stepan Oksanichenko <soksanichenko@cloudlinux.com> - 4.3.7-7
- gather-module can find modules through symlinks - gather-module can find modules through symlinks