particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove callbacks in win builder

Browse source
This commit is contained in:
Yuming Zhu 2017-05-05 15:23:46 +08:00 • committed by Mike McLean
parent 65799703e2
commit 222ed94e93
2 changed files with 5 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

18
vm/kojikamid.py
View file

@ -68,9 +68,9 @@ class WindowsBuild(object):
"""Get task info and setup build directory"""
self.logger = logging.getLogger('koji.vm')
self.server = server
self.info = server.getTaskInfo()
self.source_url = self.info[0]
self.build_tag = self.info[1]
info = server.getTaskInfo()
self.source_url = info[0]
self.build_tag = info[1]
if len(info) > 2:
self.task_opts = info[2]
else:
@ -167,29 +167,17 @@ class WindowsBuild(object):
def checkout(self):
"""Checkout sources, winspec, and patches, and apply patches"""
src_scm = SCM(self.source_url)
self.server.runCallBacks('preSCMCheckout', scminfo=src_scm.get_info())
self.source_dir = src_scm.checkout(ensuredir(os.path.join(self.workdir, 'source')))
self.server.runCallBacks('postSCMCheckout',
scminfo=src_scm.get_info(),
srcdir=self.source_dir)
self.zipDir(self.source_dir, os.path.join(self.workdir, 'sources.zip'))
if 'winspec' in self.task_opts:
spec_scm = SCM(self.task_opts['winspec'])
self.server.runCallBacks('preSCMCheckout', scminfo=spec_scm.get_info())
self.spec_dir = spec_scm.checkout(ensuredir(os.path.join(self.workdir, 'spec')))
self.server.runCallBacks('postSCMCheckout',
scminfo=spec_scm.get_info(),
srcdir=self.spec_dir)
self.zipDir(self.spec_dir, os.path.join(self.workdir, 'spec.zip'))
else:
self.spec_dir = self.source_dir
if 'patches' in self.task_opts:
patch_scm = SCM(self.task_opts['patches'])
self.server.runCallBacks('preSCMCheckout', scminfo=patch_scm.get_info())
self.patches_dir = patch_scm.checkout(ensuredir(os.path.join(self.workdir, 'patches')))
self.server.runCallBacks('postSCMCheckout',
scminfo=patch_scm.get_info(),
srcdir=self.patch_dir)
self.zipDir(self.patches_dir, os.path.join(self.workdir, 'patches.zip'))
self.applyPatches(self.source_dir, self.patches_dir)
self.virusCheck(self.workdir)

17
vm/kojivmd
View file

@ -298,13 +298,14 @@ class WinBuildTask(MultiPlatformTask):
if not opts:
opts = {}
subopts = koji.util.dslice(opts, ['winspec', 'patches', 'scratch'],
subopts = koji.util.dslice(opts, ['winspec', 'patches'],
strict=False)
# winspec and patches options are urls
# verify the urls before passing them to the VM
for url in [source_url] + subopts.values():
scm = SCM(url)
scm.assert_allowed(self.options.allowed_scms)
task_info = self.session.getTaskInfo(self.id)
target_info = self.session.getBuildTarget(target)
if not target_info:
@ -531,20 +532,6 @@ class VMExecTask(BaseTaskHandler):
"""
return self.task_info
def runCallbacks(self, method, **opts):
"""
Run callback plugins.
"""
taskinfo = self.session.getTaskInfo(self.id, request=True)
opts['taskinfo'] = taskinfo
opts['session'] = self.session
if method == 'preSCMCheckout':
opts['build_tag'] = self.task_info.get('build_tag')
elif method == 'postSCMCheckout':
opts['scratch'] = self.task_info.get('scratch')
koji.plugin.run_callbacks(method, **opts)
def initBuildroot(self, repo_id, platform):
"""
Create the buildroot object on the hub.