Bug 1250658 - balrog submitter: use blob suffixes r?jlund draft
authorRail Aliiev <rail@mozilla.com>
Tue, 23 Feb 2016 13:40:31 -0800
changeset 3652 eb836a435a45648ab418d97ca51c65e937629e5c
parent 3651 7ed77b38adea081f4c1584e58438fc5e8b820059
push id2446
push userbmo:rail@mozilla.com
push dateTue, 23 Feb 2016 21:40:35 +0000
reviewersjlund
bugs1250658
Bug 1250658 - balrog submitter: use blob suffixes r?jlund MozReview-Commit-ID: 5WGAzPmypof
manifests/moco-config.pp
modules/releaserunner/templates/release-runner.ini.erb
--- a/manifests/moco-config.pp
+++ b/manifests/moco-config.pp
@@ -179,31 +179,33 @@ class config inherits config::base {
             taskcluster_client_id => secret("releaserunner_dev_taskcluster_client_id"),
             taskcluster_access_token => secret("releaserunner_dev_taskcluster_access_token"),
             balrog_username => "stage-ffxbld",
             balrog_password => secret("stage-ffxbld_ldap_password"),
             beetmover_aws_access_key_id => secret("stage-beetmover-aws_access_key_id"),
             beetmover_aws_secret_access_key => secret("stage-beetmover-aws_secret_access_key"),
             releaserunner_buildbot_configs_branch => "default",
             releaserunner_buildbot_configs => "https://hg.mozilla.org/build/buildbot-configs",
+            extra_balrog_submitter_params => "--dummy",
         },
         "prod" => {
             ship_it_root => "https://ship-it.mozilla.org",
             ship_it_username => secret("releaserunner_prod_ship_it_username"),
             ship_it_password => secret("releaserunner_prod_ship_it_password"),
             notify_to => "Release Notifications <release-automation-notifications@mozilla.com>",
             allowed_branches => "mozilla-beta,mozilla-release,mozilla-esr,comm-beta,comm-esr",
             taskcluster_client_id => secret("releaserunner_prod_taskcluster_client_id"),
             taskcluster_access_token => secret("releaserunner_prod_taskcluster_access_token"),
             balrog_username => "ffxbld",
             balrog_password => secret("ffxbld_ldap_password"),
             beetmover_aws_access_key_id => secret("beetmover-aws_access_key_id"),
             beetmover_aws_secret_access_key => secret("beetmover-aws_secret_access_key"),
             releaserunner_buildbot_configs_branch => "production",
             releaserunner_buildbot_configs => "https://hg.mozilla.org/build/buildbot-configs",
+            extra_balrog_submitter_params => "",
         }
     }
 
     $shipit_notifier_api_root = "http://ship-it.mozilla.org"
     $shipit_notifier_verbose = true
 
     $slaveapi_slavealloc_url = "http://slavealloc.build.mozilla.org/api/"
     $slaveapi_inventory_url = "https://inventory.mozilla.org/en-US/tasty/v3/"
--- a/modules/releaserunner/templates/release-runner.ini.erb
+++ b/modules/releaserunner/templates/release-runner.ini.erb
@@ -32,15 +32,16 @@ access_token: <%= @env_config["taskclust
 
 [symlinks]
 production_config.py: {buildbot_configs}/mozilla/localconfig.py
 thunderbird_production_config.py: {buildbot_configs}/mozilla/thunderbird_localconfig.py
 
 [balrog]
 username = <%= @env_config["balrog_username"] %>
 password = <%= @env_config["balrog_password"] %>
+extra_balrog_submitter_params = <%= @env_config["extra_balrog_submitter_params"] %>
 
 [beetmover]
 aws_access_key_id = <%= @env_config["beetmover_aws_access_key_id"] %>
 aws_secret_access_key = <%= @env_config["beetmover_aws_secret_access_key"] %>
 
 [signing]
 pvt_key = <%= scope.lookupvar("config::releaserunner_root") %>/id_rsa