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

Use commit hash from source as branch

Browse Source
This commit is contained in:
Jakub Kadlčík
2017-05-16 15:20:28 +02:00
parent 8a258c3ad7
commit 9e4c43a315
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
module_build_service/builder/MockModuleBuilder.py
View File

@@ -406,7 +406,7 @@ mdpolicy=group:primary
# Git sources are treated specially.
if source.startswith(("git://", "http://", "https://")):
builder = SCMBuilder(mock_config, resultsdir, artifact_name)
builder = SCMBuilder(mock_config, resultsdir, source, artifact_name)
else:
builder = LocalBuilder(mock_config, resultsdir, source)
return self.build_srpm(artifact_name, source, build_id, builder)
@@ -442,13 +442,14 @@ class LocalBuilder(BaseBuilder):
class SCMBuilder(BaseBuilder):
def __init__(self, config, resultsdir, artifact_name):
def __init__(self, config, resultsdir, source, artifact_name):
super(SCMBuilder, self).__init__(config, resultsdir)
with open(config, "a") as f:
branch = source.split("?#")[1]
f.writelines([
"config_opts['scm'] = True\n",
"config_opts['scm_opts']['method'] = 'distgit'\n",
"config_opts['scm_opts']['branch'] = 'master'\n",
"config_opts['scm_opts']['branch'] = '{}'\n".format(branch),
"config_opts['scm_opts']['package'] = '{}'\n".format(artifact_name),
"config_opts['scm_opts']['distgit_get'] = 'fedpkg clone {} --anonymous'\n".format(artifact_name),
"config_opts['scm_opts']['distgit_src_get'] = 'fedpkg sources'\n",