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

[IMP]: add linitng tools (+bunch of small fixes)

Browse Source
This commit is contained in:
Xavier-Do 2020-10-14 11:32:08 +02:00
parent c3cc9013df
commit f9272cb207
12 changed files with 55 additions and 25 deletions

3
requirements.txt
View File

@ -1 +1,2 @@
matplotlib==3.0.2
matplotlib==3.0.2
unidiff

1
runbot/common.py
View File

@ -127,6 +127,7 @@ def pseudo_markdown(text):
r'~~(.+?)~~': '<del>\g<1></del>', # it's not official markdown but who cares
r'__(.+?)__': '<ins>\g<1></ins>', # same here, maybe we should change the method name
r'`(.+?)`': '<code>\g<1></code>',
r'\r?\n': '<br/>',
}
for p, b in patterns.items():

9
runbot/container.py
View File

@ -145,6 +145,7 @@ def _docker_run(run_cmd, log_path, build_dir, container_name, exposed_ports=None
logs = open(log_path, 'w')
run_cmd = 'cd /data/build;touch start-%s;%s;cd /data/build;touch end-%s' % (container_name, run_cmd, container_name)
docker_clear_state(container_name, build_dir) # ensure that no state are remaining
open(os.path.join(build_dir, 'exist-%s' % container_name), 'w+').close()
logs.write("Docker command:\n%s\n=================================================\n" % cmd_object)
# create start script
docker_command = [
@ -208,8 +209,13 @@ def docker_is_running(container_name):
def docker_state(container_name, build_dir):
container_name = sanitize_container_name(container_name)
exist = os.path.exists(os.path.join(build_dir, 'exist-%s' % container_name))
started = os.path.exists(os.path.join(build_dir, 'start-%s' % container_name))
ended = os.path.exists(os.path.join(build_dir, 'end-%s' % container_name))
if not exist:
return 'VOID'
if ended:
return 'END'
@ -229,6 +235,8 @@ def docker_clear_state(container_name, build_dir):
os.remove(os.path.join(build_dir, 'start-%s' % container_name))
if os.path.exists(os.path.join(build_dir, 'end-%s' % container_name)):
os.remove(os.path.join(build_dir, 'end-%s' % container_name))
if os.path.exists(os.path.join(build_dir, 'exist-%s' % container_name)):
os.remove(os.path.join(build_dir, 'exist-%s' % container_name))
def docker_get_gateway_ip():
@ -386,6 +394,7 @@ if os.environ.get('RUNBOT_MODE') == 'test':
def fake_docker_run(run_cmd, log_path, build_dir, container_name, exposed_ports=None, cpu_limit=None, preexec_fn=None, ro_volumes=None, env_variables=None, *args, **kwargs):
_logger.info('Docker Fake Run: %s', run_cmd)
open(os.path.join(build_dir, 'exist-%s' % container_name), 'w').write('fake end')
open(os.path.join(build_dir, 'start-%s' % container_name), 'w').write('fake start\n')
open(os.path.join(build_dir, 'end-%s' % container_name), 'w').write('fake end')
with open(log_path, 'w') as log_file:

2
runbot/models/build.py
View File

@ -213,7 +213,7 @@ class BuildResult(models.Model):
def _compute_log_list(self): # storing this field because it will be access trhoug repo viewn and keep track of the list at create
for build in self:
build.log_list = ','.join({step.name for step in build.params_id.config_id.step_ids() if step._has_log()})
# should be moved
# TODO replace logic, add log file to list when executed (avoid 404, link log on docker start, avoid fake is_docker_step)
@api.depends('children_ids.global_state', 'local_state')
def _compute_global_state(self):

11
runbot/models/build_config.py
View File

@ -1,10 +1,12 @@
import base64
import glob
import json
import logging
import fnmatch
import re
import shlex
import time
from unidiff import PatchSet
from ..common import now, grep, time2str, rfind, s2human, os, RunbotException
from ..container import docker_run, docker_get_gateway_ip, Command
from odoo import models, fields, api
@ -265,11 +267,12 @@ class ConfigStep(models.Model):
'log_path': build._path('logs', '%s.txt' % self.name),
'glob': glob.glob,
'Command': Command,
'base64': base64,
're': re,
'time': time,
'grep': grep,
'rfind': rfind,
'json_loads': json.loads,
'PatchSet': PatchSet,
}
def _run_python(self, build, log_path):
@ -290,7 +293,7 @@ class ConfigStep(models.Model):
if not self:
return False
self.ensure_one()
return self.job_type in ('install_odoo', 'run_odoo', 'restore', 'test_upgrade') or (self.job_type == 'python' and ('docker_run(' in self.python_code or '_run_install_odoo(' in self.python_code))
return self.job_type in ('install_odoo', 'run_odoo', 'restore', 'test_upgrade') or (self.job_type == 'python' and ('docker_run(' in self.python_code or '_run_' in self.python_code))
def _run_run_odoo(self, build, log_path, force=False):
if not force:
@ -963,9 +966,11 @@ class ConfigStep(models.Model):
self._check_log,
self._check_module_loaded,
self._check_error,
self._check_warning,
self._check_build_ended
]
if build.local_result != 'warn':
checkers.append(self._check_warning)
local_result = self._get_checkers_result(build, checkers)
build_values['local_result'] = build._get_worst_result([build.local_result, local_result])
return build_values

25
runbot/templates/batch.xml
View File

@ -2,8 +2,9 @@
<odoo>
<data>
<template id="runbot.batch">
<t t-call='website.layout'>
<div class="table-responsive">
<t t-call="website.layout">
<div class="row">
<div class="col-lg-6">
<table class="table table-stripped">
<tr>
<td>Bundle</td>
@ -110,10 +111,22 @@
</div>
</td>
</tr>
</table>
</div>
<div class="col-lg-6">
<table class="table table-stripped">
<tr>
<td>Builds</td>
<td>
<t t-foreach="batch.slot_ids" t-as="slot">
<t t-foreach="batch.slot_ids.filtered(lambda s: not s.manual)" t-as="slot">
<t t-call="runbot.slot_button"/>
</t>
</td>
</tr>
<tr>
<td>Manual</td>
<td>
<t t-foreach="batch.slot_ids.filtered(lambda s: s.manual)" t-as="slot">
<t t-call="runbot.slot_button"/>
</t>
</td>
@ -129,16 +142,14 @@
</td>
</tr>
</table>
</div>
</div>
<t t-foreach="batch.log_ids" t-as="log">
<t t-set="logclass" t-value="dict(ERROR='danger', WARNING='warning', INFO='info').get(log.level, 'warning')"/>
<div t-attf-class="alert alert-{{logclass}}">
<b t-esc="log.level"/>
--
<t t-foreach="log._markdown().split('\n')" t-as="line">
<span t-esc="line"/>
<br t-if="not line_last"/>
</t>
<t t-raw="log._markdown()"/>
</div>
</t>
</t>

10
runbot/templates/build.xml
View File

@ -125,7 +125,7 @@
<t t-foreach="build.params_id.build_ids" t-as="simbuild">
<a t-if="simbuild.id != build.id" t-attf-href="/runbot/build/#{simbuild.id}">
<span
t-attf-class="label label-{{simbuild.get_color_class()}}"
t-attf-class="badge badge-{{simbuild.get_color_class()}}"
t-esc="simbuild.id"/>
</a>
</t>
@ -179,7 +179,7 @@
</t>
</td>
<td>
<span t-attf-class="label label-info" t-esc="child.get_formated_build_time()"/>
<span t-attf-class="badge badge-info" t-esc="child.get_formated_build_time()"/>
</td>
<td>
<t t-call="runbot.build_button">
@ -217,7 +217,7 @@
<t t-foreach="build.sudo().log_ids" t-as="l">
<t t-set="subbuild" t-value="(([child for child in build.children_ids if child.id == int(l.path)] if l.type == 'subbuild' else False) or [build.browse()])[0]"/>
<t t-set="logclass" t-value="dict(CRITICAL='danger', ERROR='danger', WARNING='warning', OK='success', SEPARATOR='separator').get(l.level)"/>
<tr t-attf-class="'bg-%s-light' % {{logclass}} if {{logclass}} != 'separator' else {{logclass}}">
<tr t-att-class="'separator' if logclass != 'separator' else ''">
<td style="white-space: nowrap; width:1%;">
<t t-esc="l.create_date.strftime('%Y-%m-%d %H:%M:%S')"/>
</td>
@ -273,9 +273,7 @@
<t t-elif="l.type == 'markdown'" t-raw="l._markdown()"/>
<t t-else="">
<t t-if="'\n' not in l.message" t-esc="l.message"/>
<pre t-if="'\n' in l.message" style="margin:0;padding:0; border: none;">
<t t-esc="l.message"/>
</pre>
<pre t-if="'\n' in l.message" style="margin:0;padding:0; border: none;"><t t-esc="l.message"/></pre>
<t t-if="l.type == 'subbuild' and subbuild.sudo().error_log_ids">
<a class="show" data-toggle="collapse" t-attf-data-target="#subbuild-{{subbuild.id}}">
<i class="fa"/>

2
runbot/templates/frontend.xml
View File

@ -88,7 +88,7 @@
<div class="batch_slots">
<t t-foreach="batch.slot_ids" t-as="slot">
<t t-if="slot.build_id">
<div t-if="(not slot.trigger_id.hide and trigger_display is None) or (trigger_display and slot.trigger_id.id in trigger_display)"
<div t-if="not slot.trigger_id.manual and ((not slot.trigger_id.hide and trigger_display is None) or (trigger_display and slot.trigger_id.id in trigger_display))"
t-call="runbot.slot_button" class="slot_container"/>
</t>
</t>

2
runbot/templates/utils.xml
View File

@ -67,7 +67,7 @@
<t t-if="triggers">
<input type="hidden" name="update_triggers" t-att-value="project.id"/>
<t t-foreach="triggers" t-as="trigger">
<div class="text-nowrap">
<div t-if="not trigger.manual" class="text-nowrap">
<input type="checkbox" t-attf-name="trigger_{{trigger.id}}" t-attf-id="trigger_{{trigger.id}}" t-att-checked="trigger_display is None or trigger.id in trigger_display"/>
<label t-attf-for="trigger_{{trigger.id}}" t-esc="trigger.name"/>
</div>

11
runbot/tests/test_event.py
View File

@ -71,12 +71,19 @@ class TestIrLogging(RunbotCase):
'some <strong>bold text</strong> and also some <ins>underlined text</ins> and maybe a bit of <del>strikethrough text</del>'
)
log.message = 'a bit of code `import foo\nfoo.bar`'
#log.message = 'a bit of code `import foo\nfoo.bar`'
#self.assertEqual(
# log._markdown(),
# 'a bit of code <code>import foo\nfoo.bar</code>'
#)
log.message = 'a bit of code :\n`import foo`'
self.assertEqual(
log._markdown(),
'a bit of code <code>import foo\nfoo.bar</code>'
'a bit of code :<br/><code>import foo</code>'
)
# test icon
log.message = 'Hello @icon-file-text-o'
self.assertEqual(

2
runbot/tests/test_upgrade.py
View File

@ -161,8 +161,6 @@ class TestUpgradeFlow(RunbotCase):
'upgrade_dumps_trigger_id': self.trigger_addons_nightly.id,
})
self.branch_upgrade.bundle_id # force recompute TODO remove this once fixed
with mute_logger('odoo.addons.runbot.models.commit'):
self.build_niglty_master, self.build_weekly_master = self.create_version('master')
self.build_niglty_11, self.build_weekly_11 = self.create_version('11.0')

2
runbot_cla/build_config.py
View File

@ -35,7 +35,7 @@ class Step(models.Model):
cla = ''.join(io.open(f, encoding='utf-8').read() for f in cla_glob)
if cla.lower().find(email) == -1:
error = True
build._log('check_cla', 'Invalid email format %s' % email, level="ERROR")
build._log('check_cla', 'Email not found in cla file %s' % email, level="ERROR")
except UnicodeDecodeError:
error = True
build._log('check_cla', 'Invalid CLA encoding (must be utf-8)', level="ERROR")