Bug 1254540 - Use separate Balrog API for production r=kmoir
authorRail Aliiev <rail@mozilla.com>
Tue, 08 Mar 2016 10:07:16 -0500
changeset 12778 ff40254797eb74d5a14ca21c4e24b33ca4b0c422
parent 12777 796a9d7226e0837e924f0c0f1d381f769291323c
child 13912 1ce5d30d8e7cb01e9b280caf010ce7b30acf0f2d
child 14022 80075c14f28bd2e9df74892d7cda9156750ffc5d
push id22
push userbmo:rail@mozilla.com
push dateTue, 08 Mar 2016 15:07:22 +0000
reviewerskmoir
bugs1254540
Bug 1254540 - Use separate Balrog API for production r=kmoir MozReview-Commit-ID: IVdETkRv8Zc
mozilla/production_config.py
mozilla/project_branches.py
--- a/mozilla/production_config.py
+++ b/mozilla/production_config.py
@@ -43,16 +43,18 @@ TRY_SLAVES = {
 GLOBAL_VARS = {
     'config_repo_path': 'build/buildbot-configs',
     'buildbotcustom_repo_path': 'build/buildbotcustom',
     'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
     'download_base_url': 'http://archive.mozilla.org/pub/firefox',
     'mobile_download_base_url': 'http://archive.mozilla.org/pub/mobile',
     'graph_server': 'graphs.mozilla.org',
     'balrog_api_root': 'https://aus4-admin.mozilla.org/api',
+    # Used by special docker workers with balrogVpnProxy feature enabled
+    'funsize_balrog_api_root': 'http://balrog/api',
     'balrog_username': 'ffxbld',
     'balrog_submitter_extra_args': ['--url-replacement',
                                     'ftp.mozilla.org,download.cdn.mozilla.net'],
     'build_tools_repo_path': 'build/tools',
     'base_clobber_url': 'https://api.pub.build.mozilla.org/clobberer/lastclobber',
     # List of talos masters to notify of new builds,
     # and if a failure to notify the talos master should result in a warning,
     # and sendchange retry count before give up
--- a/mozilla/project_branches.py
+++ b/mozilla/project_branches.py
@@ -152,16 +152,17 @@ PROJECT_BRANCHES = {
         'build_tools_repo_path': 'users/raliiev_mozilla.com/tools',
         'partners_repo_path': 'build/partner-repacks',
         'partner_repack_platforms': ('linux', 'linux64', 'win32', 'win64', 'macosx64'),
         "release_platforms": ("linux", "linux64", "win32", "win64", "macosx64"),
         "l10n_release_platforms": ("linux", "linux64", "win32", "win64", "macosx64"),
         "release_channels": ("date", ),
         # temp balrog
         'balrog_api_root': 'http://ec2-54-241-39-23.us-west-1.compute.amazonaws.com:443/api',
+        'funsize_balrog_api_root': 'http://ec2-54-241-39-23.us-west-1.compute.amazonaws.com:443/api',
         'tuxedoServerUrl': 'https://admin-bouncer.stage.mozaws.net/api',
         'bouncer_submitter_config': "releases/bouncer_firefox_date.py",
         'bouncer_branch': "releases/date",
         'bouncer_enabled': True,
         'postrelease_version_bump_enabled': True,
         'postrelease_version_bump_config': 'releases/postrelease_date.py',
         'push_to_candidates_enabled': True,
         'updates_config': 'releases/updates_date.py',