Bug 1453240 - Deploy beetmover 6.0.0 r=Callek,tomprince,aki
MozReview-Commit-ID: LvZlgYmHj1F
--- a/modules/beetmover_scriptworker/manifests/init.pp
+++ b/modules/beetmover_scriptworker/manifests/init.pp
@@ -25,17 +25,17 @@ class beetmover_scriptworker {
mode => '0700',
packages => [
'Jinja2==2.10.0',
'MarkupSafe==1.0',
'PyYAML==3.12',
'aiohttp==2.3.1',
'arrow==0.10.0',
'async_timeout==1.4.0',
- 'beetmoverscript==5.1.2',
+ 'beetmoverscript==6.0.0',
'boto3==1.5.19',
'botocore==1.8.33',
'certifi==2018.1.18',
'chardet==3.0.4',
'defusedxml==0.5.0',
'dictdiffer==0.7.0',
'docutils==0.14',
'frozendict==1.2',
--- a/modules/beetmover_scriptworker/manifests/settings.pp
+++ b/modules/beetmover_scriptworker/manifests/settings.pp
@@ -27,16 +27,17 @@ class beetmover_scriptworker::settings {
dep_beetmover_aws_secret_access_key => secret('stage-beetmover-aws_secret_access_key'),
dep_beetmover_aws_s3_firefox_bucket => 'net-mozaws-stage-delivery-firefox',
dep_beetmover_aws_s3_fennec_bucket => 'net-mozaws-stage-delivery-archive',
config_template => 'beetmover_scriptworker/dev_script_config.json.erb',
worker_type => 'beetmoverworker-dev',
taskcluster_client_id => 'project/releng/scriptworker/beetmover-dev',
taskcluster_access_token => secret('beetmoverworker_dev_taskcluster_access_token'),
+ taskcluster_scope_prefix => 'project:releng:beetmover:',
sign_chain_of_trust => false,
verify_chain_of_trust => true,
verify_cot_signature => false,
},
'prod' => {
nightly_beetmover_aws_access_key_id => secret('nightly-beetmover-aws_access_key_id'),
nightly_beetmover_aws_secret_access_key => secret('nightly-beetmover-aws_secret_access_key'),
nightly_beetmover_aws_s3_firefox_bucket => 'net-mozaws-prod-delivery-firefox',
@@ -51,14 +52,15 @@ class beetmover_scriptworker::settings {
dep_beetmover_aws_secret_access_key => secret('stage-beetmover-aws_secret_access_key'),
dep_beetmover_aws_s3_firefox_bucket => 'net-mozaws-stage-delivery-firefox',
dep_beetmover_aws_s3_fennec_bucket => 'net-mozaws-stage-delivery-archive',
config_template => 'beetmover_scriptworker/prod_script_config.json.erb',
worker_type => 'beetmoverworker-v1',
taskcluster_client_id => 'project/releng/scriptworker/beetmoverworker',
taskcluster_access_token => secret('beetmoverworker_prod_taskcluster_access_token'),
+ taskcluster_scope_prefix => 'project:releng:beetmover:',
sign_chain_of_trust => true,
verify_chain_of_trust => true,
verify_cot_signature => true,
}
}
}
--- a/modules/beetmover_scriptworker/templates/base_script_config.json.erb
+++ b/modules/beetmover_scriptworker/templates/base_script_config.json.erb
@@ -1,15 +1,16 @@
"work_dir": "<%= scope.lookupvar("beetmover_scriptworker::settings::root") %>/work",
"artifact_dir": "<%= scope.lookupvar("beetmover_scriptworker::settings::root") %>/artifacts",
"aiohttp_max_connections": 10,
"checksums_digests": ["sha512", "sha256"],
"blobs_needing_prettynaming_contents": [
"target.test_packages.json"
],
+ "taskcluster_scope_prefix": "<%= @env_config["taskcluster_scope_prefix"] %>",
"schema_file": "<%= scope.lookupvar("beetmover_scriptworker::settings::root") %>/lib/python3.5/site-packages/beetmoverscript/data/beetmover_task_schema.json",
"release_schema_file": "<%= scope.lookupvar("beetmover_scriptworker::settings::root") %>/lib/python3.5/site-packages/beetmoverscript/data/release_beetmover_task_schema.json",
"verbose": <%= scope.lookupvar("beetmover_scriptworker::settings::verbose_logging") %>,
"actions": {
"push-to-nightly": {