almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

New upstream release 4.3.1

Browse Source
This commit is contained in:
Lubomír Sedlář 2021-10-26 09:57:37 +02:00
parent e38503e36b
commit 890224867b
3 changed files with 15 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
1550.patch
View File

@ -1,46 +0,0 @@
From 911febfa4a655d8577cb2f6c0634e652a8235ae4 Mon Sep 17 00:00:00 2001
From: Lubomír Sedlář <lsedlar@redhat.com>
Date: Sep 14 2021 09:44:45 +0000
Subject: Work around ODCS creating COMPOSE_ID later
When ODCS starts a compose, it will provide base composeinfo file, but
it doesn't create COMPOSE_ID. This leads to a crash when updating CTS,
since the compose id can't be read from the file. We can instead use the
value we already have in memory.
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
---
diff --git a/pungi/compose.py b/pungi/compose.py
index 37f6344..f02df9d 100644
--- a/pungi/compose.py
+++ b/pungi/compose.py
@@ -150,11 +150,9 @@ def write_compose_info(compose_dir, ci):
ci.dump(os.path.join(work_dir, "composeinfo-base.json"))
-def update_compose_url(compose_dir, conf):
+def update_compose_url(compose_id, compose_dir, conf):
import requests
- with open(os.path.join(compose_dir, "COMPOSE_ID"), "r") as f:
- compose_id = f.read()
authentication = get_authentication(conf)
cts_url = conf.get("cts_url", None)
if cts_url:
diff --git a/pungi/scripts/pungi_koji.py b/pungi/scripts/pungi_koji.py
index 6f1b92a..45b25fe 100644
--- a/pungi/scripts/pungi_koji.py
+++ b/pungi/scripts/pungi_koji.py
@@ -329,7 +329,7 @@ def main():
notifier=notifier,
)
- rv = Compose.update_compose_url(compose_dir, conf)
+ rv = Compose.update_compose_url(compose.compose_id, compose_dir, conf)
if rv and not rv.ok:
logger.error("CTS compose_url update failed with the error: %s" % rv.text)

17
pungi.spec
View File

@ -1,14 +1,13 @@
%{?python_enable_dependency_generator}
Name: pungi
Version: 4.3.0
Release: 2%{?dist}
Version: 4.3.1
Release: 1%{?dist}
Summary: Distribution compose tool
License: GPLv2
URL: https://pagure.io/pungi
Source0: https://pagure.io/releases/%{name}/%{name}-%{version}.tar.bz2
Patch0: https://pagure.io/pungi/pull-request/1550.patch
BuildRequires: make
BuildRequires: python3-nose
@ -138,6 +137,18 @@ nosetests-3 --exe -e test_variant_repo_rpms
%{_bindir}/%{name}-wait-for-signed-ostree-handler
%changelog
* Tue Oct 26 2021 Lubomír Sedlář <lsedlar@redhat.com> - 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ář <lsedlar@redhat.com> - 4.3.0-2
- Backport patch to avoid crash on missing COMPOSE_ID

2
sources
View File

@ -1 +1 @@
SHA512 (pungi-4.3.0.tar.bz2) = a9a94e992e4323b572daa0d308dd451cd8f7e5f0825b712cb55176400c72f12f3e25b629b735dc8d88246072ff083a5b9d4f0b2afa9b368dc913641c246c0ca2
SHA512 (pungi-4.3.1.tar.bz2) = da9f58679beb8c1007cd1a38f4f26b2b8ed2e3de49032b19be67834d3af61ff58d5c0853dadf1a7f60ab7cd4212ecb1d39aa57d40b4692be5bd63c6a915cd0ce