Bug 1445684 - add bouncer aliases preflight check regexes. r=aki
MozReview-Commit-ID: 2EdNBG80TkA
--- a/modules/bouncer_scriptworker/manifests/init.pp
+++ b/modules/bouncer_scriptworker/manifests/init.pp
@@ -21,17 +21,17 @@ class bouncer_scriptworker {
user => $users::builder::username,
group => $users::builder::group,
mode => '0700',
packages => [
'PyYAML==3.12',
'aiohttp==2.3.9',
'arrow==0.12.1',
'async_timeout==1.4.0',
- 'bouncerscript==1.1.0',
+ 'bouncerscript==1.2.0',
'certifi==2018.1.18',
'chardet==3.0.4',
'defusedxml==0.5.0',
'dictdiffer==0.7.0',
'frozendict==1.2',
'idna==2.6',
'json-e==2.5.0',
'jsonschema==2.6.0',
--- a/modules/bouncer_scriptworker/manifests/settings.pp
+++ b/modules/bouncer_scriptworker/manifests/settings.pp
@@ -70,19 +70,40 @@ class bouncer_scriptworker::settings {
$worker_type = $_env_config['worker_type']
$sign_chain_of_trust = $_env_config['sign_chain_of_trust']
$verify_chain_of_trust = $_env_config['verify_chain_of_trust']
$verify_cot_signature = $_env_config['verify_cot_signature']
$verbose_logging = $_env_config['verbose_logging']
+ $all_regexes = {
+ thunderbird-beta-latest => '^Thunderbird-\d+\.0b\d+$',
+ thunderbird-latest => '^Thunderbird-\d+\.\d+(\.\d+)?$',
+ fennec-beta-latest => '^Fennec-\d+\.0b\d+$',
+ fennec-latest => '^Fennec-\d+\.\d+(\.\d+)?$',
+ firefox-devedition-stub => '^Devedition-\d+\.0b\d+-stub$',
+ firefox-devedition-latest => '^Devedition-\d+\.0b\d+$',
+ firefox-devedition-latest-ssl => '^Devedition-\d+\.0b\d+-SSL$',
+ firefox-beta-stub => '^Firefox-\d+\.0b\d+-stub$',
+ firefox-beta-latest => '^Firefox-\d+\.0b\d+$',
+ firefox-beta-latest-ssl => '^Firefox-\d+\.0b\d+-SSL$',
+ firefox-stub => '^Firefox-\d+\.\d+(\.\d+)?-stub$',
+ firefox-latest => '^Firefox-\d+\.\d+(\.\d+)?$',
+ firefox-latest-ssl => '^Firefox-\d+\.\d+(\.\d+)?-SSL$',
+ firefox-esr-latest => '^Firefox-\d+\.\d+(\.\d+)?esr$',
+ firefox-esr-latest-ssl => '^Firefox-\d+\.\d+(\.\d+)?esr-SSL$',
+ firefox-sha1 => '^Firefox-\d+\.\d+(\.\d+)?esr-sha1$',
+ firefox-sha1-ssl => '^Firefox-\d+\.\d+(\.\d+)?esr-sha1$'
+ }
+
$script_config = "${root}/script_config.json"
$script_config_content = {
work_dir => $work_dir,
schema_files => {
submission => "${root}/lib/python3.5/site-packages/bouncerscript/data/bouncer_submission_task_schema.json",
aliases => "${root}/lib/python3.5/site-packages/bouncerscript/data/bouncer_aliases_task_schema.json",
},
verbose => $verbose_logging,
bouncer_config => $_env_config['bouncer_instances'],
+ aliases_regexes => $all_regexes
}
}