From 237e931e577dfd5f541dc35168f62246f05ef76e Mon Sep 17 00:00:00 2001 From: David James Date: Sat, 10 Oct 2020 18:55:23 +1100 Subject: [PATCH] [IMP] runbot: add extra parameters and environment variables to run stages --- runbot/models/build_config.py | 7 ++++++- runbot/views/config_views.xml | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/runbot/models/build_config.py b/runbot/models/build_config.py index 45b61a49..49c7fd5c 100644 --- a/runbot/models/build_config.py +++ b/runbot/models/build_config.py @@ -338,12 +338,17 @@ class ConfigStep(models.Model): if smtp_host: cmd += ['--smtp', smtp_host] + extra_params = self.extra_params or '' + if extra_params: + cmd.extend(shlex.split(extra_params)) + env_variables = self.additionnal_env.split(';') if self.additionnal_env else [] + docker_name = build._get_docker_name() build_path = build._path() build_port = build.port self.env.cr.commit() # commit before docker run to be 100% sure that db state is consistent with dockers self.invalidate_cache() - res = docker_run(cmd, log_path, build_path, docker_name, exposed_ports=[build_port, build_port + 1], ro_volumes=exports) + res = docker_run(cmd, log_path, build_path, docker_name, exposed_ports=[build_port, build_port + 1], ro_volumes=exports, env_variables=env_variables) self.env['runbot.runbot']._reload_nginx() return res diff --git a/runbot/views/config_views.xml b/runbot/views/config_views.xml index 019e577f..1db948cc 100644 --- a/runbot/views/config_views.xml +++ b/runbot/views/config_views.xml @@ -72,9 +72,9 @@ - - + +