Skip to content
This repository has been archived by the owner on Jun 18, 2021. It is now read-only.

Commit

Permalink
merge default -> production
Browse files Browse the repository at this point in the history 
--HG--
branch : production
  • Loading branch information
@escapewindow
escapewindow committed Mar 6, 2018
2 parents 371127b + 3bc1250 commit 5c34c75
Show file tree
Hide file tree
Showing 17 changed files with 123 additions and 146 deletions.
37 changes: 18 additions & 19 deletions modules/balrog_scriptworker/manifests/init.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
'python-dateutil==2.6.1',
'python-gnupg==0.4.1',
'requests==2.18.4',
'scriptworker==8.0.0',
'scriptworker==10.0.0',
'six==1.10.0',
'slugid==1.0.7',
'taskcluster==2.1.3',
Expand Down Expand Up @@ -88,31 +88,30 @@

scriptworker::instance {
$balrog_scriptworker::settings::root:
instance_name => $module_name,
basedir => $balrog_scriptworker::settings::root,
instance_name => $module_name,
basedir => $balrog_scriptworker::settings::root,

task_script_executable => $balrog_scriptworker::settings::task_script_executable,
task_script => $balrog_scriptworker::settings::task_script,
task_script_config => $balrog_scriptworker::settings::task_script_config,
task_script_executable => $balrog_scriptworker::settings::task_script_executable,
task_script => $balrog_scriptworker::settings::task_script,
task_script_config => $balrog_scriptworker::settings::task_script_config,

username => $users::builder::username,
group => $users::builder::group,
username => $users::builder::username,
group => $users::builder::group,

taskcluster_client_id => $env_config["taskcluster_client_id"],
taskcluster_access_token => $env_config["taskcluster_access_token"],
worker_group => $balrog_scriptworker::settings::worker_group,
worker_type => $env_config["worker_type"],
taskcluster_client_id => $env_config["taskcluster_client_id"],
taskcluster_access_token => $env_config["taskcluster_access_token"],
worker_group => $balrog_scriptworker::settings::worker_group,
worker_type => $env_config["worker_type"],

task_max_timeout => $balrog_scriptworker::settings::task_max_timeout,
artifact_expiration_hours => $balrog_scriptworker::settings::artifact_expiration_hours,
task_max_timeout => $balrog_scriptworker::settings::task_max_timeout,

cot_job_type => 'balrog',
cot_job_type => 'balrog',

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"],
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 => $balrog_scriptworker::settings::verbose_logging,
verbose_logging => $balrog_scriptworker::settings::verbose_logging,
}

mercurial::repo {
Expand Down
2 changes: 0 additions & 2 deletions modules/balrog_scriptworker/manifests/settings.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
balrog_password => secret('balrog-stage-ffxbld_ldap_password'),
balrog_api_root => 'https://balrog-admin.stage.mozaws.net/api',

artifact_expiration_hours => 336,
dummy => false,
tools_repo => 'https://hg.mozilla.org/build/tools',
taskcluster_client_id => 'project/releng/scriptworker/balrogworker-dev',
Expand All @@ -33,7 +32,6 @@
balrog_password => secret('balrog-ffxbld_ldap_password'),
balrog_api_root => 'https://aus4-admin.mozilla.org/api',

artifact_expiration_hours => 8760,
dummy => false,
tools_repo => 'https://hg.mozilla.org/build/tools',
taskcluster_client_id => 'project/releng/scriptworker/balrogworker',
Expand Down
35 changes: 17 additions & 18 deletions modules/beetmover_scriptworker/manifests/init.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
'redo==1.6',
'requests==2.18.4',
's3transfer==0.1.12',
'scriptworker==8.0.0',
'scriptworker==10.0.0',
'six==1.10.0',
'slugid==1.0.7',
'taskcluster==2.1.3',
Expand All @@ -64,30 +64,29 @@

scriptworker::instance {
$beetmover_scriptworker::settings::root:
instance_name => $module_name,
basedir => $beetmover_scriptworker::settings::root,
instance_name => $module_name,
basedir => $beetmover_scriptworker::settings::root,

task_script => $beetmover_scriptworker::settings::task_script,
task_script_config => $beetmover_scriptworker::settings::task_script_config,
task_script => $beetmover_scriptworker::settings::task_script,
task_script_config => $beetmover_scriptworker::settings::task_script_config,

username => $users::builder::username,
group => $users::builder::group,
username => $users::builder::username,
group => $users::builder::group,

taskcluster_client_id => $env_config["taskcluster_client_id"],
taskcluster_access_token => $env_config["taskcluster_access_token"],
worker_group => $beetmover_scriptworker::settings::worker_group,
worker_type => $env_config["worker_type"],
taskcluster_client_id => $env_config["taskcluster_client_id"],
taskcluster_access_token => $env_config["taskcluster_access_token"],
worker_group => $beetmover_scriptworker::settings::worker_group,
worker_type => $env_config["worker_type"],

task_max_timeout => $beetmover_scriptworker::settings::task_max_timeout,
artifact_expiration_hours => $beetmover_scriptworker::settings::artifact_expiration_hours,
task_max_timeout => $beetmover_scriptworker::settings::task_max_timeout,

cot_job_type => 'beetmover',
cot_job_type => 'beetmover',

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"],
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 => $beetmover_scriptworker::settings::verbose_logging,
verbose_logging => $beetmover_scriptworker::settings::verbose_logging,
}

file {
Expand Down
2 changes: 0 additions & 2 deletions modules/beetmover_scriptworker/manifests/settings.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
worker_type => 'beetmoverworker-dev',
taskcluster_client_id => 'project/releng/scriptworker/beetmover-dev',
taskcluster_access_token => secret('beetmoverworker_dev_taskcluster_access_token'),
artifact_expiration_hours => 336,
sign_chain_of_trust => false,
verify_chain_of_trust => true,
verify_cot_signature => false,
Expand All @@ -57,7 +56,6 @@
worker_type => 'beetmoverworker-v1',
taskcluster_client_id => 'project/releng/scriptworker/beetmoverworker',
taskcluster_access_token => secret('beetmoverworker_prod_taskcluster_access_token'),
artifact_expiration_hours => 8760,
sign_chain_of_trust => true,
verify_chain_of_trust => true,
verify_cot_signature => true,
Expand Down
2 changes: 1 addition & 1 deletion modules/bouncer_scriptworker/manifests/init.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
'python-gnupg==0.4.1',
'redo==1.6',
'requests==2.18.4',
'scriptworker==9.0.0',
'scriptworker==10.0.0',
'six==1.10.0',
'slugid==1.0.7',
'taskcluster==2.1.3',
Expand Down
33 changes: 16 additions & 17 deletions modules/pushapk_scriptworker/manifests/init.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
'python-gnupg==0.4.1',
'requests==2.18.4',
'rsa==3.4.2',
'scriptworker==8.0.0',
'scriptworker==10.0.0',
'six==1.10.0',
'slugid==1.0.7',
'taskcluster==2.1.3',
Expand All @@ -67,28 +67,27 @@

scriptworker::instance {
$pushapk_scriptworker::settings::root:
instance_name => $module_name,
basedir => $pushapk_scriptworker::settings::root,
work_dir => $pushapk_scriptworker::settings::work_dir,
instance_name => $module_name,
basedir => $pushapk_scriptworker::settings::root,
work_dir => $pushapk_scriptworker::settings::work_dir,

task_script => $pushapk_scriptworker::settings::task_script,
task_script => $pushapk_scriptworker::settings::task_script,

username => $pushapk_scriptworker::settings::user,
group => $pushapk_scriptworker::settings::group,
username => $pushapk_scriptworker::settings::user,
group => $pushapk_scriptworker::settings::group,

taskcluster_client_id => $pushapk_scriptworker::settings::taskcluster_client_id,
taskcluster_access_token => $pushapk_scriptworker::settings::taskcluster_access_token,
worker_group => $pushapk_scriptworker::settings::worker_group,
worker_type => $pushapk_scriptworker::settings::worker_type,
taskcluster_client_id => $pushapk_scriptworker::settings::taskcluster_client_id,
taskcluster_access_token => $pushapk_scriptworker::settings::taskcluster_access_token,
worker_group => $pushapk_scriptworker::settings::worker_group,
worker_type => $pushapk_scriptworker::settings::worker_type,

artifact_expiration_hours => $pushapk_scriptworker::settings::artifact_expiration_hours,
cot_job_type => 'pushapk',
cot_job_type => 'pushapk',

sign_chain_of_trust => $pushapk_scriptworker::settings::sign_chain_of_trust,
verify_chain_of_trust => $pushapk_scriptworker::settings::verify_chain_of_trust,
verify_cot_signature => $pushapk_scriptworker::settings::verify_cot_signature,
sign_chain_of_trust => $pushapk_scriptworker::settings::sign_chain_of_trust,
verify_chain_of_trust => $pushapk_scriptworker::settings::verify_chain_of_trust,
verify_cot_signature => $pushapk_scriptworker::settings::verify_cot_signature,

verbose_logging => $pushapk_scriptworker::settings::verbose_logging,
verbose_logging => $pushapk_scriptworker::settings::verbose_logging,
}

File {
Expand Down
2 changes: 0 additions & 2 deletions modules/pushapk_scriptworker/manifests/settings.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
verbose_logging => true,
taskcluster_client_id => secret('pushapk_scriptworker_taskcluster_client_id_dep'),
taskcluster_access_token => secret('pushapk_scriptworker_taskcluster_access_token_dep'),
artifact_expiration_hours => 336,

sign_chain_of_trust => false,
verify_chain_of_trust => true,
Expand All @@ -27,7 +26,6 @@
verbose_logging => true,
taskcluster_client_id => secret('pushapk_scriptworker_taskcluster_client_id_prod'),
taskcluster_access_token => secret('pushapk_scriptworker_taskcluster_access_token_prod'),
artifact_expiration_hours => 8760,

sign_chain_of_trust => true,
verify_chain_of_trust => true,
Expand Down
1 change: 0 additions & 1 deletion modules/scriptworker/manifests/instance.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@

$worker_id = $hostname,
$task_max_timeout = 3600,
$artifact_expiration_hours = 336,
$artifact_upload_timeout = 1200,

$sign_chain_of_trust = true,
Expand Down
1 change: 0 additions & 1 deletion modules/scriptworker/templates/scriptworker.yaml.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ credentials:
clientId: <%= @taskcluster_client_id %>
accessToken: <%= @taskcluster_access_token %>

artifact_expiration_hours: <%= @artifact_expiration_hours %>
artifact_upload_timeout: <%= @artifact_upload_timeout %>
task_max_timeout: <%= @task_max_timeout %>
task_script: ["<%= @task_script_executable %>", "<%= @task_script %>", "<%= @task_script_config %>"]
Expand Down
33 changes: 16 additions & 17 deletions modules/shipit_scriptworker/manifests/init.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
'python-gnupg==0.4.1',
'redo==1.6',
'requests==2.18.4',
'scriptworker==8.1.0',
'scriptworker==10.0.0',
'shipitapi==0.1.0',
'shipitscript==0.1.0',
'six==1.10.0',
Expand All @@ -53,28 +53,27 @@

scriptworker::instance {
$shipit_scriptworker::settings::root:
instance_name => $module_name,
basedir => $shipit_scriptworker::settings::root,
work_dir => $shipit_scriptworker::settings::work_dir,
instance_name => $module_name,
basedir => $shipit_scriptworker::settings::root,
work_dir => $shipit_scriptworker::settings::work_dir,

task_script => $shipit_scriptworker::settings::task_script,
task_script => $shipit_scriptworker::settings::task_script,

username => $shipit_scriptworker::settings::user,
group => $shipit_scriptworker::settings::group,
username => $shipit_scriptworker::settings::user,
group => $shipit_scriptworker::settings::group,

taskcluster_client_id => $shipit_scriptworker::settings::taskcluster_client_id,
taskcluster_access_token => $shipit_scriptworker::settings::taskcluster_access_token,
worker_group => $shipit_scriptworker::settings::worker_group,
worker_type => $shipit_scriptworker::settings::worker_type,
artifact_expiration_hours => $shipit_scriptworker::settings::artifact_expiration_hours,
taskcluster_client_id => $shipit_scriptworker::settings::taskcluster_client_id,
taskcluster_access_token => $shipit_scriptworker::settings::taskcluster_access_token,
worker_group => $shipit_scriptworker::settings::worker_group,
worker_type => $shipit_scriptworker::settings::worker_type,

cot_job_type => 'shipit',
cot_job_type => 'shipit',

sign_chain_of_trust => $shipit_scriptworker::settings::sign_chain_of_trust,
verify_chain_of_trust => $shipit_scriptworker::settings::verify_chain_of_trust,
verify_cot_signature => $shipit_scriptworker::settings::verify_cot_signature,
sign_chain_of_trust => $shipit_scriptworker::settings::sign_chain_of_trust,
verify_chain_of_trust => $shipit_scriptworker::settings::verify_chain_of_trust,
verify_cot_signature => $shipit_scriptworker::settings::verify_cot_signature,

verbose_logging => $shipit_scriptworker::settings::verbose_logging,
verbose_logging => $shipit_scriptworker::settings::verbose_logging,
}

File {
Expand Down
2 changes: 0 additions & 2 deletions modules/shipit_scriptworker/manifests/settings.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
verbose_logging => true,
taskcluster_client_id => 'project/releng/scriptworker/shipit/dev',
taskcluster_access_token => secret('shipit_scriptworker_taskcluster_access_token_dev'),
artifact_expiration_hours => 336,

sign_chain_of_trust => false,
verify_chain_of_trust => true,
Expand All @@ -39,7 +38,6 @@
verbose_logging => true,
taskcluster_client_id => 'project/releng/scriptworker/shipit/production',
taskcluster_access_token => secret('shipit_scriptworker_taskcluster_access_token_prod'),
artifact_expiration_hours => 8760,

sign_chain_of_trust => true,
verify_chain_of_trust => true,
Expand Down
37 changes: 18 additions & 19 deletions modules/signing_scriptworker/manifests/init.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
'python-gnupg==0.4.1',
'python-jose==2.0.0',
'requests==2.18.1',
'scriptworker==8.1.0',
'scriptworker==10.0.0',
'signingscript==5.0.0',
'signtool==3.1.6',
'simplejson==3.13.2',
Expand All @@ -70,30 +70,29 @@

scriptworker::instance {
$signing_scriptworker::settings::root:
instance_name => $module_name,
basedir => $signing_scriptworker::settings::root,
instance_name => $module_name,
basedir => $signing_scriptworker::settings::root,

task_script => $signing_scriptworker::settings::task_script,
task_script_config => $signing_scriptworker::settings::task_script_config,
task_script => $signing_scriptworker::settings::task_script,
task_script_config => $signing_scriptworker::settings::task_script_config,

username => $users::signer::username,
group => $users::signer::group,
username => $users::signer::username,
group => $users::signer::group,

taskcluster_client_id => $env_config['taskcluster_client_id'],
taskcluster_access_token => $env_config['taskcluster_access_token'],
worker_group => $env_config['worker_group'],
worker_type => $env_config['worker_type'],
task_max_timeout => $signing_scriptworker::settings::task_max_timeout,
artifact_expiration_hours => $signing_scriptworker::settings::artifact_expiration_hours,
taskcluster_client_id => $env_config['taskcluster_client_id'],
taskcluster_access_token => $env_config['taskcluster_access_token'],
worker_group => $env_config['worker_group'],
worker_type => $env_config['worker_type'],
task_max_timeout => $signing_scriptworker::settings::task_max_timeout,

cot_job_type => 'signing',
cot_product => $env_config['cot_product'],
cot_job_type => 'signing',
cot_product => $env_config['cot_product'],

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"],
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 => $signing_scriptworker::settings::verbose
verbose_logging => $signing_scriptworker::settings::verbose
}

file {
Expand Down
Loading

0 comments on commit 5c34c75

Please sign in to comment.