From 02a4da07311982a2b621b02b6d57c2b15e85b51d Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Apr 20 2018 16:18:56 +0000 Subject: Fixes by Patrick Signed-off-by: Mohan Boddu --- diff --git a/ansible/library/fedcontainer_rebuild.py b/ansible/library/fedcontainer_rebuild.py index 5f2311b..bb7aabd 100644 --- a/ansible/library/fedcontainer_rebuild.py +++ b/ansible/library/fedcontainer_rebuild.py @@ -135,7 +135,7 @@ def rebuild(branch, containers, user, stage, koji_bin=None, koji_profile=None): # Currently the container namespace in DistGit is called "container" cntr_ns = 'container' - work_dir = tempfile.mkdtemp() + work_dir = tempfile.mkdtemp(prefix='container-rebuild-') # List of koji tasks to watch at the end koji_tasks = [] @@ -220,9 +220,11 @@ def rebuild(branch, containers, user, stage, koji_bin=None, koji_profile=None): # are supported in fedpkg cmd = koji_prefix + [ "call", + "--python", "buildContainer", - "git+https://{}/{}/{}.git?#{}".format(git_url, cntr_ns, container, commit_hash).strip(), - branch, + "'git+https://{}/{}/{}.git?#{}'".format(git_url, cntr_ns, container, commit_hash.strip()), + "'%s-container-candidate'" % branch, + "{'git_branch': '%s'}" % branch, ] returncode, stdout, stderr = run_cmd_ary(cmd)