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

Update from upstream #11

Closed
soksanichenko wants to merge 158 commits from a8_updated into a8
pull from: a8_updated
merge into: almalinux:a8
Conversation 0 Commits 158 Files Changed 128 +2 -4
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ac061b2ea8 - Show all commits

4
pungi/compose.py
View File

@ -150,11 +150,9 @@ def write_compose_info(compose_dir, ci):
ci.dump(os.path.join(work_dir, "composeinfo-base.json")) 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 import requests
with open(os.path.join(compose_dir, "COMPOSE_ID"), "r") as f:
compose_id = f.read()
authentication = get_authentication(conf) authentication = get_authentication(conf)
cts_url = conf.get("cts_url", None) cts_url = conf.get("cts_url", None)
if cts_url: if cts_url:

2
pungi/scripts/pungi_koji.py
View File

@ -329,7 +329,7 @@ def main():
notifier=notifier, 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: if rv and not rv.ok:
logger.error("CTS compose_url update failed with the error: %s" % rv.text) logger.error("CTS compose_url update failed with the error: %s" % rv.text)