NextERP/runbot
5
0
Fork 0
mirror of https://github.com/odoo/runbot.git synced 2025-03-27 13:25:47 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

[IMP] various code cleanups in runbot.py

Browse Source
This commit is contained in:
Gery Debongnie 2014-06-26 14:36:03 +02:00
parent 30a36aa0f6
commit a70e64e976
1 changed files with 43 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
runbot/runbot.py
View File

@ -140,12 +140,12 @@ class runbot_repo(osv.osv):
return result return result
def _get_base(self, cr, uid, ids, field_name, arg, context=None): def _get_base(self, cr, uid, ids, field_name, arg, context=None):
r = {} result = {}
for repo in self.browse(cr, uid, ids, context=context): for repo in self.browse(cr, uid, ids, context=context):
name = re.sub('.+@', '', repo.name) name = re.sub('.+@', '', repo.name)
name = name.replace(':','/') name = name.replace(':','/')
r[repo.id] = name result[repo.id] = name
return r return result
_columns = { _columns = {
'name': fields.char('Repository', required=True), 'name': fields.char('Repository', required=True),
@ -176,6 +176,7 @@ class runbot_repo(osv.osv):
return self.pool.get('ir.config_parameter').get_param(cr, uid, 'runbot.root', default) return self.pool.get('ir.config_parameter').get_param(cr, uid, 'runbot.root', default)
def git(self, cr, uid, ids, cmd, context=None): def git(self, cr, uid, ids, cmd, context=None):
"""Execute git command cmd"""
for repo in self.browse(cr, uid, ids, context=context): for repo in self.browse(cr, uid, ids, context=context):
cmd = ['git', '--git-dir=%s' % repo.path] + cmd cmd = ['git', '--git-dir=%s' % repo.path] + cmd
_logger.info("git: %s", ' '.join(cmd)) _logger.info("git: %s", ' '.join(cmd))
@ -190,22 +191,23 @@ class runbot_repo(osv.osv):
p2.communicate()[0] p2.communicate()[0]
def github(self, cr, uid, ids, url, payload=None, delete=False, context=None): def github(self, cr, uid, ids, url, payload=None, delete=False, context=None):
"""Return a http request to be sent to github"""
for repo in self.browse(cr, uid, ids, context=context): for repo in self.browse(cr, uid, ids, context=context):
mo = re.search('([^/]+)/([^/]+)/([^/]+)', repo.base) match_object = re.search('([^/]+)/([^/]+)/([^/]+)', repo.base)
if mo: if match_object:
url = url.replace(':owner', mo.group(2)) url = url.replace(':owner', match_object.group(2))
url = url.replace(':repo', mo.group(3)) url = url.replace(':repo', match_object.group(3))
url = 'https://api.%s%s' % (mo.group(1),url) url = 'https://api.%s%s' % (match_object.group(1),url)
s = requests.Session() session = requests.Session()
s.auth = (repo.token,'x-oauth-basic') session.auth = (repo.token,'x-oauth-basic')
s.headers.update({'Accept': 'application/vnd.github.she-hulk-preview+json'}) session.headers.update({'Accept': 'application/vnd.github.she-hulk-preview+json'})
if payload: if payload:
r = s.post(url, data=simplejson.dumps(payload)) response = session.post(url, data=simplejson.dumps(payload))
elif delete: elif delete:
r = s.delete(url) response = session.delete(url)
else: else:
r = s.get(url) response = session.get(url)
return r.json() return response.json()
def update(self, cr, uid, ids, context=None): def update(self, cr, uid, ids, context=None):
for repo in self.browse(cr, uid, ids, context=context): for repo in self.browse(cr, uid, ids, context=context):
@ -222,18 +224,17 @@ class runbot_repo(osv.osv):
repo.git(['fetch', '-p', 'origin', '+refs/pull/*/head:refs/pull/*']) repo.git(['fetch', '-p', 'origin', '+refs/pull/*/head:refs/pull/*'])
fields = ['refname','objectname','authordate:iso8601','authorname','subject'] fields = ['refname','objectname','authordate:iso8601','authorname','subject']
fmt = "%00".join(["%("+i+")" for i in fields]) fmt = "%00".join(["%("+field+")" for field in fields])
out = repo.git(['for-each-ref', '--format', fmt, '--sort=-committerdate', 'refs/heads', 'refs/pull']) git_refs = repo.git(['for-each-ref', '--format', fmt, '--sort=-committerdate', 'refs/heads', 'refs/pull'])
out = out.strip() git_refs = git_refs.strip()
refs = []
for l in out.split('\n'): def decode_utf(string):
ref = [] try:
for i in l.split('\x00'): return field.decode('utf-8')
try: except UnicodeDecodeError:
ref.append(i.decode('utf-8')) return ''
except UnicodeDecodeError: refs = [[decode_utf(field) for field in line.split('\x00')] for line in git_refs.split('\n')]
ref.append('')
refs.append(ref)
for name, sha, date, author, subject in refs: for name, sha, date, author, subject in refs:
# create or get branch # create or get branch
branch_ids = self.pool['runbot.branch'].search(cr, uid, [('repo_id', '=', repo.id), ('name', '=', name)]) branch_ids = self.pool['runbot.branch'].search(cr, uid, [('repo_id', '=', repo.id), ('name', '=', name)])
@ -250,39 +251,39 @@ class runbot_repo(osv.osv):
build_ids = self.pool['runbot.build'].search(cr, uid, [('branch_id', '=', branch.id), ('name', '=', sha)]) build_ids = self.pool['runbot.build'].search(cr, uid, [('branch_id', '=', branch.id), ('name', '=', sha)])
if not build_ids: if not build_ids:
_logger.debug('repo %s branch %s new build found revno %s', branch.repo_id.name, branch.name, sha) _logger.debug('repo %s branch %s new build found revno %s', branch.repo_id.name, branch.name, sha)
v = { build_info = {
'branch_id': branch.id, 'branch_id': branch.id,
'name': sha, 'name': sha,
'author': author, 'author': author,
'subject': subject, 'subject': subject,
} }
self.pool['runbot.build'].create(cr, uid, v) self.pool['runbot.build'].create(cr, uid, build_info)
def scheduler(self, cr, uid, ids=None, context=None): def scheduler(self, cr, uid, ids=None, context=None):
for repo in self.browse(cr, uid, ids, context=context): for repo in self.browse(cr, uid, ids, context=context):
bo = self.pool['runbot.build'] Build = self.pool['runbot.build']
dom = [('repo_id', '=', repo.id)] dom = [('repo_id', '=', repo.id)]
# schedule jobs # schedule jobs
build_ids = bo.search(cr, uid, dom + [('state', 'in', ['testing', 'running'])]) build_ids = Build.search(cr, uid, dom + [('state', 'in', ['testing', 'running'])])
bo.schedule(cr, uid, build_ids) Build.schedule(cr, uid, build_ids)
# launch new tests # launch new tests
testing = bo.search(cr, uid, dom + [('state', '=', 'testing')], count=True) testing = Build.search(cr, uid, dom + [('state', '=', 'testing')], count=True)
while testing < repo.testing: while testing < repo.testing:
# select the next build to process # select the next build to process
pending_ids = bo.search(cr, uid, dom + [('state', '=', 'pending')]) pending_ids = Build.search(cr, uid, dom + [('state', '=', 'pending')])
if pending_ids: if pending_ids:
pending = bo.browse(cr, uid, pending_ids[0]) pending = Build.browse(cr, uid, pending_ids[0])
else: else:
break break
# gather information about currently running builds # gather information about currently running builds
running_ids = bo.search(cr, uid, dom + [('state', '=', 'running')]) running_ids = Build.search(cr, uid, dom + [('state', '=', 'running')])
running_len = len(running_ids) running_len = len(running_ids)
running_max = 0 running_max = 0
if running_ids: if running_ids:
running_max = bo.browse(cr, uid, running_ids[0]).sequence running_max = Build.browse(cr, uid, running_ids[0]).sequence
# determine if pending one should be launched # determine if pending one should be launched
if running_len < repo.running or pending.sequence >= running_max: if running_len < repo.running or pending.sequence >= running_max:
@ -291,14 +292,14 @@ class runbot_repo(osv.osv):
break break
# compute the number of testing job again # compute the number of testing job again
testing = bo.search(cr, uid, dom + [('state', '=', 'testing')], count=True) testing = Build.search(cr, uid, dom + [('state', '=', 'testing')], count=True)
# terminate and reap doomed build # terminate and reap doomed build
build_ids = bo.search(cr, uid, dom + [('state', '=', 'running')]) build_ids = Build.search(cr, uid, dom + [('state', '=', 'running')])
# sort builds: the last build of each sticky branch then the rest # sort builds: the last build of each sticky branch then the rest
sticky = {} sticky = {}
non_sticky = [] non_sticky = []
for build in bo.browse(cr, uid, build_ids): for build in Build.browse(cr, uid, build_ids):
if build.branch_id.sticky and build.branch_id.id not in sticky: if build.branch_id.sticky and build.branch_id.id not in sticky:
sticky[build.branch_id.id] = build.id sticky[build.branch_id.id] = build.id
else: else:
@ -306,8 +307,8 @@ class runbot_repo(osv.osv):
build_ids = sticky.values() build_ids = sticky.values()
build_ids += non_sticky build_ids += non_sticky
# terminate extra running builds # terminate extra running builds
bo.terminate(cr, uid, build_ids[repo.running:]) Build.terminate(cr, uid, build_ids[repo.running:])
bo.reap(cr, uid, build_ids) Build.reap(cr, uid, build_ids)
def nginx(self, cr, uid, context=None): def nginx(self, cr, uid, context=None):
v = {} v = {}