diff --git a/software/erp5/instance-erp5-input-schema.json b/software/erp5/instance-erp5-input-schema.json index beec3f3f5e3b30befb4c875bc6d9ff323e12a9c3..4af4f5df267638e53f5a2a33d6b907e28b16e4c5 100644 --- a/software/erp5/instance-erp5-input-schema.json +++ b/software/erp5/instance-erp5-input-schema.json @@ -622,6 +622,11 @@ } } ] + }, + "random-activity-priority": { + "type": "string", + "title": "Random Activity Priority", + "description": "Control `random_activity_priority` argument of test runner. Can be set to an empty string to automatically generate a seed for each test." } }, "type": "object" diff --git a/stack/erp5/buildout.hash.cfg b/stack/erp5/buildout.hash.cfg index 042b5bb0c7c5bc5cc8345bb29a731b2751b6c057..ba7bddef4425197e1a64528df7846b3e4499b187 100644 --- a/stack/erp5/buildout.hash.cfg +++ b/stack/erp5/buildout.hash.cfg @@ -74,7 +74,7 @@ md5sum = bbef65b4edeb342f08309604ca3717d5 [template-erp5] filename = instance-erp5.cfg.in -md5sum = fcc8470824c448a56e2282c43b870cb5 +md5sum = c10634353841bb09a847168b4add8d2f [template-zeo] filename = instance-zeo.cfg.in @@ -86,7 +86,7 @@ md5sum = bc821f9f9696953b10a03ad7b59a1936 [template-zope] filename = instance-zope.cfg.in -md5sum = 769e81946c346530cebfce6ad7553165 +md5sum = f3121380ab4d31ba5f4984aec74d0a2f [template-balancer] filename = instance-balancer.cfg.in diff --git a/stack/erp5/instance-erp5.cfg.in b/stack/erp5/instance-erp5.cfg.in index 153dda1bbac6f90212a775c0945f62c0baaee638..15ae741318902ef8d2c2297474803baca9efd14c 100644 --- a/stack/erp5/instance-erp5.cfg.in +++ b/stack/erp5/instance-erp5.cfg.in @@ -21,6 +21,7 @@ {% set test_runner_total_database_count = mariadb_test_database_amount %} {% set test_runner_enabled = mariadb_test_database_amount > 0 %} {% endif -%} +{% set test_runner_random_activity_priority = slapparameter_dict.get('test-runner', {}).get('random-activity-priority') -%} {% set monitor_base_url_dict = {} -%} {% set monitor_dict = slapparameter_dict.get('monitor', {}) %} {% set use_ipv6 = slapparameter_dict.get('use-ipv6', False) -%} @@ -259,6 +260,7 @@ config-wendelin-core-zblk-fmt = {{ dumps(slapparameter_dict.get('wendelin-core-z config-wsgi = {{ dumps(slapparameter_dict.get('wsgi', True)) }} config-test-runner-enabled = {{ dumps(test_runner_enabled) }} config-test-runner-node-count = {{ dumps(test_runner_node_count) }} +config-test-runner-random-activity-priority = {{ dumps(test_runner_random_activity_priority) }} config-wcfs_enable = {{ dumps(wcfs_enable) }} config-test-runner-configuration = {{č˝dumps(slapparameter_dict.get('test-runner', {})) }} software-type = zope diff --git a/stack/erp5/instance-zope.cfg.in b/stack/erp5/instance-zope.cfg.in index 44ce863f5b308b6fb8657c0a462804cc8b35ce7d..9adeaece78b6be6055abd11bfbb13ca5989dee79 100644 --- a/stack/erp5/instance-zope.cfg.in +++ b/stack/erp5/instance-zope.cfg.in @@ -13,6 +13,7 @@ {% set test_runner_address_list = [] -%} {% set test_runner_enabled = slapparameter_dict['test-runner-enabled'] -%} {% set test_runner_node_count = slapparameter_dict['test-runner-node-count'] -%} +{% set test_runner_random_activity_priority = slapparameter_dict['test-runner-random-activity-priority'] -%} {% set longrequest_logger_base_path = buildout_directory ~ '/var/log/longrequest_logger_' -%} {% macro section(name) %}{% do part_list.append(name) %}{{ name }}{% endmacro -%} {% set bin_directory = parameter_dict['buildout-bin-directory'] -%} @@ -503,6 +504,9 @@ command-line-extra = --extra_sql_connection_string_list '{{ ','.join(connection_string_list[1:]) }}' --zserver {{ test_runner_address_list[0][0] ~ ':' ~ test_runner_address_list[0][1] }} --zserver_frontend_url {{ slapparameter_dict['test-runner-apache-url-list'][0] }} + {% if test_runner_random_activity_priority is not none %} + --random_activity_priority={{ test_runner_random_activity_priority }} + {%- endif %} [{{ section('runTestSuite') }}] < = run-test-common