modules/fm-orchestrator
1
0
Fork 0
mirror of https://pagure.io/fm-orchestrator.git synced 2026-04-05 03:38:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move also distgit_src_get command to config

Browse Source
This commit is contained in:
Jakub Kadlčík
2017-05-17 16:23:16 +02:00
parent 8c8ea65b2e
commit 99ba03b52d
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
module_build_service/builder/MockModuleBuilder.py
View File

@@ -446,18 +446,19 @@ class SCMBuilder(BaseBuilder):
super(SCMBuilder, self).__init__(config, resultsdir)
with open(config, "a") as f:
branch = source.split("?#")[1]
dist_git_get = self._get_clone_command(source).format(artifact_name)
distgit_cmds = self._get_distgit_commands(source)
distgit_get = distgit_cmds[0].format(artifact_name)
f.writelines([
"config_opts['scm'] = True\n",
"config_opts['scm_opts']['method'] = 'distgit'\n",
"config_opts['scm_opts']['branch'] = '{}'\n".format(branch),
"config_opts['scm_opts']['package'] = '{}'\n".format(artifact_name),
"config_opts['scm_opts']['distgit_get'] = '{}'\n".format(dist_git_get),
"config_opts['scm_opts']['distgit_src_get'] = 'fedpkg sources'\n",
"config_opts['scm_opts']['distgit_get'] = '{}'\n".format(distgit_get),
"config_opts['scm_opts']['distgit_src_get'] = '{}'\n".format(distgit_cmds[1]),
])
def _get_clone_command(self, source):
for host, cmd in conf.distgits.items():
def _get_distgit_commands(self, source):
for host, cmds in conf.distgits.items():
if source.startswith(host):
return cmd
raise KeyError("No defined command for {}".format(source))
return cmds
raise KeyError("No defined commands for {}".format(source))

2
module_build_service/config.py
View File

@@ -289,7 +289,7 @@ class Config(object):
'distgits': {
'type': dict,
'default': {
'git://pkgs.fedoraproject.org': 'fedpkg clone --anonymous {}',
'git://pkgs.fedoraproject.org': ('fedpkg clone --anonymous {}', 'fedpkg sources'),
},
'desc': 'Mapping between dist-git and command to '},
'mock_config': {