Skip to content

[IMP] runbot: allow to set a memory limit factor #1360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Xavier-Do wants to merge 1 commit into
base: 19.0
Choose a base branch
from
Open

[IMP] runbot: allow to set a memory limit factor #1360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion runbot/models/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1021,7 +1021,9 @@ def _docker_run(self, step, cmd=None, ro_volumes=None, env_variables=None, **kwa

containers_memory_limit = self.env['ir.config_parameter'].sudo().get_param('runbot.runbot_containers_memory', 0)
if containers_memory_limit and 'memory' not in kwargs:
kwargs['memory'] = int(float(containers_memory_limit) * 1024 ** 3)
memory_limit_factor = float(self.params_id.config_data.get('memory_limit_factor', 1))
containers_memory_limit = int(float(containers_memory_limit) * 1024 ** 3) * memory_limit_factor
kwargs['memory'] = containers_memory_limit

self.docker_start = now()
if self.job_start:
Expand Down
28 changes: 18 additions & 10 deletions runbot/tests/test_build_config_step.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1185,22 +1185,15 @@ def test_network_can_be_enable(self, mock_checkout):
'job_type': 'install_odoo',
})

# by default, network is disabled
def first_docker_run(cmd, log_path, *args, **kwargs):
self.assertFalse(kwargs['network_enabled'])

self.docker_run_patch = first_docker_run
config_step._run_step(self.parent_build)()

def second_docker_run(cmd, log_path, *args, **kwargs):
self.assertTrue(kwargs['network_enabled'])

self.docker_run_patch = second_docker_run
self.assertFalse(self.docker_run_calls[0][3]['network_enabled'])

parent_build_params = self.parent_build.params_id.copy({'config_data': {'network_enabled': True}})
parent_build = self.parent_build.copy({'params_id': parent_build_params.id})
config_step._run_step(parent_build)()

self.assertTrue(self.docker_run_calls[1][3]['network_enabled'])


@patch('odoo.addons.runbot.models.build.BuildResult._checkout')
def test_run_python_networkcan_be_enabled(self, mock_checkout):
Expand Down Expand Up @@ -1241,6 +1234,21 @@ def test_install_custom_parametric_tags(self, mock_checkout, parse_config):
tags = self.get_test_tags(params)
self.assertEqual(tags, '"-at_install,/web/foo.py:WebSuite.test_unit_desktop[@bar/test with spaces],-/web/bar.py[@snafu/other test with spaces]"')

@patch('odoo.addons.runbot.models.build.BuildResult._checkout')
def test_memory_limit(self, mock_checkout):
""" test that network can be disabled with config_data """
config_step = self.ConfigStep.create({
'name': 'default',
'job_type': 'install_odoo',
})
self.env['ir.config_parameter'].sudo().set_param('runbot.runbot_containers_memory', 10)
config_step._run_step(self.parent_build)()
self.assertEqual(self.docker_run_calls[0][3]['memory'], 10 * 1024 ** 3)

parent_build_params = self.parent_build.params_id.copy({'config_data': {'memory_limit_factor': 0.9}})
parent_build = self.parent_build.copy({'params_id': parent_build_params.id})
config_step._run_step(parent_build)()
self.assertEqual(self.docker_run_calls[1][3]['memory'], 9 * 1024 ** 3)
class TestMakeResult(RunbotCase):

def setUp(self):
Expand Down