From 98913f6d39d03f7e54c14f2eeb7cf5e3b85acac2 Mon Sep 17 00:00:00 2001 From: Xavier-Do Date: Sat, 18 May 2019 14:20:05 +0200 Subject: [PATCH] [FIX] runbot: fix cla step --- runbot/models/build_config.py | 4 ++-- runbot_cla/build_config.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/runbot/models/build_config.py b/runbot/models/build_config.py index 9141590b..016744d1 100644 --- a/runbot/models/build_config.py +++ b/runbot/models/build_config.py @@ -165,9 +165,9 @@ class ConfigStep(models.Model): log_path = build._path('logs', '%s.txt' % self.name) build.write({'job_start': now(), 'job_end': False}) # state, ... build._log('run', 'Starting step %s from config %s' % (self.name, build.config_id.name), level='SEPARATOR') - return self._run_step(log_path, build) + return self._run_step(build, log_path) - def _run_step(self, log_path, build): + def _run_step(self, build, log_path): if self.job_type == 'run_odoo': return self._run_odoo_run(build, log_path) if self.job_type == 'install_odoo': diff --git a/runbot_cla/build_config.py b/runbot_cla/build_config.py index 7f8e6693..2889bcbf 100644 --- a/runbot_cla/build_config.py +++ b/runbot_cla/build_config.py @@ -10,15 +10,15 @@ from odoo import models, fields _logger = logging.getLogger(__name__) -class Job(models.Model): +class Step(models.Model): _inherit = "runbot.build.config.step" - + job_type = fields.Selection(selection_add=[('cla_check', 'Check cla')]) def _run_step(self, build, log_path): - if self.job_type != 'cla_check': + if self.job_type == 'cla_check': return self._runbot_cla_check(build, log_path) - return super(Job, self)._run_step(build, log_path) + return super(Step, self)._run_step(build, log_path) def _runbot_cla_check(self, build, log_path): cla_glob = glob.glob(build._path("doc/cla/*/*.md"))