modules/fm-orchestrator
1
0
Fork 0
mirror of https://pagure.io/fm-orchestrator.git synced 2026-02-13 18:15:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow CoprModuleBuilder to obtain packages from copr-dist-git

Browse Source
This commit is contained in:
Jakub Kadlčík
2017-05-30 13:13:46 +02:00
parent 91e08d723f
commit 56efd10db9
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
module_build_service/builder/utils.py
View File

@@ -1,4 +1,5 @@
import os
import re
import sys
import koji
import tempfile
@@ -40,17 +41,18 @@ def build_from_scm(artifact_name, source, config, build_srpm,
url, commit = source.split("?#")
# Create temp dir and clone the repo there.
td = tempfile.mkdtemp()
scm = module_build_service.scm.SCM(url)
scm = module_build_service.scm.SCM(source)
cod = scm.checkout(td)
branch = git_branch_contains(cod, commit)
git_checkout(cod, branch)
cmd = config.mock_build_srpm_cmd.split(" ")
if is_from_copr(source):
branch = git_branch_contains(cod, commit)
git_checkout(cod, branch)
cmd = ["fedpkg-copr", "--release", branch, "srpm"]
# Use configured command to create SRPM out of the SCM repo.
log.debug("Creating SRPM in %s" % cod)
distgit_cmds = get_distgit_commands(source, config)
execute_cmd(distgit_cmds[1].split(" "),
stdout=stdout, stderr=stderr, cwd=cod)
execute_cmd(cmd, stdout=stdout, stderr=stderr, cwd=cod)
# Find out the built SRPM and build it normally.
for f in os.listdir(cod):
@@ -78,7 +80,14 @@ def build_from_scm(artifact_name, source, config, build_srpm,
def git_branch_contains(cod, commit):
cmd = ["git", "branch", "-r", "--contains", commit]
out, err = execute_cmd(cmd, cwd=cod, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
return out.strip().split("/")[1]
branch = out.strip().split("/")[1]
if " -> " in branch:
branch = branch.split(" -> ")[0]
return branch
def is_from_copr(source):
return bool(re.match("https?://copr-dist-git(-dev)?\.fedorainfracloud\.org", source))
def git_checkout(cod, branch):