Bug 1217281 - Make buildbot-configs branch env dependent. r=Callek
authorRail Aliiev <rail@mozilla.com>
Thu, 22 Oct 2015 07:04:22 -0400
changeset 3704 e028ab614b28d472b45664719109bc51b6e3d978
parent 3702 7c3c78d2ea64d2ea328ca365b19ac09b655f2f7f
child 3705 7b776477db2c52bcdf2ba5f46b548aa9f7930f85
child 3706 f86230a455801dd497dfb7f65f86106efa11a43e
push id2817
push userraliiev@mozilla.com
push dateThu, 22 Oct 2015 11:04:38 +0000
reviewersCallek
bugs1217281
Bug 1217281 - Make buildbot-configs branch env dependent. r=Callek
manifests/moco-config.pp
modules/config/manifests/base.pp
modules/releaserunner/templates/release-runner.ini.erb
--- a/manifests/moco-config.pp
+++ b/manifests/moco-config.pp
@@ -175,27 +175,31 @@ class config inherits config::base {
             ship_it_username => secret("releaserunner_dev_ship_it_username"),
             ship_it_password => secret("releaserunner_dev_ship_it_password"),
             notify_to => "Release Notifications Dev <release-automation-notifications-dev@mozilla.com>",
             allowed_branches => "date",
             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"),
+            releaserunner_buildbot_configs_branch => "default",
+            releaserunner_buildbot_configs => "https://hg.mozilla.org/build/buildbot-configs",
         },
         "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"),
+            releaserunner_buildbot_configs_branch => "production",
+            releaserunner_buildbot_configs => "https://hg.mozilla.org/build/buildbot-configs",
         }
     }
 
     $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/config/manifests/base.pp
+++ b/modules/config/manifests/base.pp
@@ -238,19 +238,16 @@ class config::base {
     # email to/from addresses and smtp server to use to send notifications
     $releaserunner_notify_from = ""
     $releaserunner_smtp_server = ""
     # ssh username and (hand-installed) key to use to login to all buildmasters
     # and perform updates and reconfigs
     $releaserunner_ssh_username = ""
     # URL for masters.json, defaulting to $master_json from above
     $releaserunner_production_masters = $master_json
-    # mercurial repository and branch for buildbot-configs
-    $releaserunner_buildbot_configs_branch = "production"
-    $releaserunner_buildbot_configs = "https://hg.mozilla.org/build/buildbot-configs"
     # mercurial repository and branch for buildbotcustom
     $releaserunner_buildbotcustom_branch = "production-0.8"
     $releaserunner_buildbotcustom = "https://hg.mozilla.org/build/buildbotcustom"
     # mercurial repository and branch for tools
     $releaserunner_tools = "https://hg.mozilla.org/build/tools"
     $releaserunner_tools_branch = "default"
     # root directory for releaserunner; this must be under /builds
     $releaserunner_root = "/builds/releaserunner"
--- a/modules/releaserunner/templates/release-runner.ini.erb
+++ b/modules/releaserunner/templates/release-runner.ini.erb
@@ -5,18 +5,18 @@ password: <%= @env_config["ship_it_passw
 
 [release-runner]
 notify_from: <%= scope.lookupvar('config::releaserunner_notify_from') %>
 notify_to: <%= @env_config["notify_to"] %>
 smtp_server: <%= scope.lookupvar('config::releaserunner_smtp_server') %>
 hg_host: <%= scope.lookupvar('config::releaserunner_hg_host') %>
 hg_username: <%= scope.lookupvar('config::releaserunner_hg_username') %>
 hg_ssh_key: <%= scope.lookupvar('config::releaserunner_hg_ssh_key') %>
-buildbot_configs: <%= scope.lookupvar('config::releaserunner_buildbot_configs') %>
-buildbot_configs_branch: <%= scope.lookupvar('config::releaserunner_buildbot_configs_branch') %>
+buildbot_configs: <%= @env_config["releaserunner_buildbot_configs"] %>
+buildbot_configs_branch: <%= @env_config["releaserunner_buildbot_configs_branch"] %>
 buildbotcustom: <%= scope.lookupvar('config::releaserunner_buildbotcustom') %>
 buildbotcustom_branch: <%= scope.lookupvar('config::releaserunner_buildbotcustom_branch') %>
 tools: <%= scope.lookupvar('config::releaserunner_tools') %>
 tools_branch: <%= scope.lookupvar('config::releaserunner_tools_branch') %>
 masters_json: <%= scope.lookupvar('config::releaserunner_production_masters') %>
 sendchange_master: <%= scope.lookupvar('config::releaserunner_sendchange_master') %>
 staging: false
 verbose: true