[IMP] runbot: add use_ssl to settings

This commit is contained in:
Xavier-Do 2023-06-02 10:39:37 +02:00
parent feb820775c
commit 4964436f16
4 changed files with 11 additions and 3 deletions

View File

@ -47,6 +47,11 @@ admin_passwd=running_master_password</field>
<field name="value">^((master)|(saas-)?\d+\.\d+)$</field>
</record>
<record model="ir.config_parameter" id="runbot.use_ssl">
<field name="key">runbot.use_ssl</field>
<field name="value">True</field>
</record>
<record model="ir.config_parameter" id="runbot.runbot_forwardport_author">
<field name="key">runbot.runbot_forwardport_author</field>
<field name="value">fw-bot</field>

View File

@ -28,6 +28,7 @@ class ResConfigSettings(models.TransientModel):
runbot_forwardport_author = fields.Char('Forwardbot author')
runbot_organisation = fields.Char('Organisation')
runbot_disable_host_on_fetch_failure = fields.Boolean('Disable host on fetch failure')
runbot_use_ssl = fields.Boolean('Use ssl for workers', help="select if worker ressources (log, dump, ...) uses ssl or not.", config_parameter="runbot.use_ssl")
runbot_db_gc_days = fields.Integer(
'Days before gc',

View File

@ -421,7 +421,7 @@ class TestUpgradeFlow(RunbotCase):
source_dest = current_build.params_id.dump_db.build_id.dest
def docker_run_restore(cmd, *args, **kwargs):
dump_url = f'http://host.runbot.com/runbot/static/build/{source_dest}/logs/{source_dest}-{suffix}.zip'
dump_url = f'https://host.runbot.com/runbot/static/build/{source_dest}/logs/{source_dest}-{suffix}.zip'
zip_name = f'{source_dest}-{suffix}.zip'
db_name = f'{current_build.dest}-{suffix}'
self.assertEqual(

View File

@ -25,6 +25,10 @@
<field name="runbot_timeout" style="width: 15%;"/>
<label for="runbot_starting_port" class="col-xs-3 o_light_label" style="width: 60%;"/>
<field name="runbot_starting_port" style="width: 15%;"/>
<label for="runbot_disable_host_on_fetch_failure" class="col-xs-3 o_light_label" style="width: 60%;"/>
<field name="runbot_disable_host_on_fetch_failure" style="width: 15%;"/>
<label for="runbot_use_ssl" class="col-xs-3 o_light_label" style="width: 60%;"/>
<field name="runbot_use_ssl" style="width: 15%;"/>
</div>
</div>
</div>
@ -34,8 +38,6 @@
<div class="content-group">
<label for="runbot_max_age" class="col-xs-3 o_light_label" style="width: 60%;"/>
<field name="runbot_max_age" style="width: 15%;"/>
<label for="runbot_disable_host_on_fetch_failure" class="col-xs-3 o_light_label" style="width: 40%;"/>
<field name="runbot_disable_host_on_fetch_failure" style="width: 15%;"/>
</div>
</div>
</div>