Bug 1216907 - Uploads are broken on try for desktop and mobile builds since S3 migration, r=bustage
authorNick Thomas <nthomas@mozilla.com>
Wed, 21 Oct 2015 22:07:21 +1300
changeset 303925 0ee21e8d5ca60bae3930bc126040b2c4aed2d3cb
parent 303924 644ac87b6f7472f14b34bc277af219ab9d28f1e3
child 303926 64ea72607527194a0ac0fe401beb2d3c1c81d576
push id1001
push userraliiev@mozilla.com
push dateMon, 18 Jan 2016 19:06:03 +0000
treeherdermozilla-release@8b89261f3ac4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage
bugs1216907
milestone44.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1216907 - Uploads are broken on try for desktop and mobile builds since S3 migration, r=bustage
testing/mozharness/configs/builds/branch_specifics.py
testing/mozharness/configs/builds/build_pool_specifics.py
--- a/testing/mozharness/configs/builds/branch_specifics.py
+++ b/testing/mozharness/configs/builds/branch_specifics.py
@@ -30,78 +30,83 @@
 
 config = {
     ### release branches
     "mozilla-central": {
         "repo_path": 'mozilla-central',
         "update_channel": "nightly",
         "graph_server_branch_name": "Firefox",
         'use_branch_in_symbols_extra_buildid': False,
+        'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
     },
     'mozilla-release': {
         'repo_path': 'releases/mozilla-release',
         # TODO I think we can remove update_channel since we don't run
         # nightlies for mozilla-release
         'update_channel': 'release',
         'branch_uses_per_checkin_strategy': True,
         'use_branch_in_symbols_extra_buildid': False,
+        'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
     },
     'mozilla-beta': {
         'repo_path': 'releases/mozilla-beta',
         # TODO I think we can remove update_channel since we don't run
         # nightlies for mozilla-beta
         'update_channel': 'beta',
         'branch_uses_per_checkin_strategy': True,
         'use_branch_in_symbols_extra_buildid': False,
+        'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
     },
     'mozilla-aurora': {
         'repo_path': 'releases/mozilla-aurora',
         'update_channel': 'aurora',
         'branch_uses_per_checkin_strategy': True,
         'use_branch_in_symbols_extra_buildid': False,
-    },
-    'mozilla-esr31': {
-        'repo_path': 'releases/mozilla-esr31',
-        'update_channel': 'nightly-esr31',
-        'branch_uses_per_checkin_strategy': True,
-        'use_branch_in_symbols_extra_buildid': False,
+        'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
     },
     'try': {
         'repo_path': 'try',
         'clone_by_revision': True,
         'clone_with_purge': True,
         'tinderbox_build_dir': '%(who)s-%(got_revision)s',
         'to_tinderbox_dated': False,
         'include_post_upload_builddir': True,
         'release_to_try_builds': True,
         'use_branch_in_symbols_extra_buildid': False,
+        'stage_server': 'upload.trybld.productdelivery.prod.mozaws.net',
         'stage_username': 'trybld',
         'stage_ssh_key': 'trybld_dsa',
         'branch_supports_uploadsymbols': False,
         'use_clobberer': False,
     },
 
     ### project branches
     'b2g-inbound': {
         'repo_path': 'integration/b2g-inbound',
+        'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
     },
     'fx-team': {
         'repo_path': 'integration/fx-team',
+        'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
     },
     'gum': {
         'branch_uses_per_checkin_strategy': True,
+        'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
     },
     'mozilla-inbound': {
         'repo_path': 'integration/mozilla-inbound',
+        'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
     },
     'services-central': {
         'repo_path': 'services/services-central',
+        'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
     },
     'ux': {
         "graph_server_branch_name": "UX",
+        'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
     },
     # When build promotion goes live the mozconfig changes are probably better
     # expressed once in files like configs/builds/releng_base_windows_32_builds.py
     'date': {
         'enable_release_promotion': 1,
         'platform_overrides': {
             'linux': {
                 'src_mozconfig': 'browser/config/mozconfigs/linux32/beta',
@@ -114,30 +119,50 @@ config = {
             },
             'win32': {
                 'src_mozconfig': 'browser/config/mozconfigs/win32/beta',
             },
             'win64': {
                 'src_mozconfig': 'browser/config/mozconfigs/win64/beta',
             },
         },
+        'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
     },
     'cypress': {
         # bug 1164935
         'branch_uses_per_checkin_strategy': True,
-    }
+        'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
+    },
 
     ### other branches that do not require anything special:
-    # 'alder': {},
-    # 'ash': {},
-    # 'birch': {},
+    'alder': {
+        'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
+    },
+    'ash': {
+        'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
+    },
+    'birch': {
+        'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
+    },
     # 'build-system': {}
-    # 'cedar': {},
-    # 'elm': {},
-    # 'fig': {},
+    'cedar': {
+        'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
+    },
+    'elm': {
+        'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
+    },
+    'fig': {},
     # 'graphics': {}
     # 'holly': {},
-    # 'jamun': {},
-    # 'larch': {},
+    'jamun': {
+        'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
+    },
+    'larch': {
+        'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
+    },
     # 'maple': {},
-    # 'oak': {},
-    # 'pine': {}
+    'oak': {
+        'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
+    },
+    'pine': {
+        'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
+    },
 }
--- a/testing/mozharness/configs/builds/build_pool_specifics.py
+++ b/testing/mozharness/configs/builds/build_pool_specifics.py
@@ -12,31 +12,32 @@ config = {
         # self._query_graph_server_branch_name()
         "graph_server_branch_name": "MozillaTest",
         'graph_server': 'graphs.allizom.org',
         "hgtool_base_bundle_urls": [
             'http://dev-stage01.build.mozilla.org/pub/mozilla'
             '.org/firefox/bundles',
         ],
         'symbol_server_host': "dev-stage01.srv.releng.scl3.mozilla.com",
-        'stage_server': 'dev-stage01.srv.releng.scl3.mozilla.com',
+        'stage_server': 'upload.ffxbld.productdelivery.stage.mozaws.net',
         "sendchange_masters": ["dev-master1.srv.releng.scl3.mozilla.com:9038"],
         'taskcluster_index': 'index.garbage.staging',
     },
     "production": {
         # if not clobberer_url, only clobber 'abs_work_dir'
         # if true: possibly clobber, clobberer, and purge_builds
         # see PurgeMixin for clobber() conditions
         'clobberer_url': 'https://api.pub.build.mozilla.org/clobberer/lastclobber',
         'graph_server': 'graphs.mozilla.org',
         "hgtool_base_bundle_urls": [
             'https://ftp-ssl.mozilla.org/pub/mozilla.org/firefox/bundles'
         ],
         'symbol_server_host': "symbolpush.mozilla.org",
-        'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
+        # bug 1216907, set this at branch level
+        # 'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
         "sendchange_masters": ["buildbot-master81.build.mozilla.org:9301"],
         'taskcluster_index': 'index',
     },
     "taskcluster": {
         'graph_server': 'graphs.mozilla.org',
         'symbol_server_host': "symbolpush.mozilla.org",
         'stage_server': 'ignored',
         # use the relengapi proxy to talk to tooltool