Bug 1088044 - Enable Win64 PGO builds and tests. r=catlee
authorArmen Zambrano Gasparnian <armenzg@mozilla.com>
Thu, 23 Oct 2014 17:16:42 -0400 (2014-10-23)
changeset 11273 ee73b349cb451119a27f27e908744c8f35aac2d9
parent 11272 212838bb4cfad14125961e988c3923cf4f6d8f21
child 11276 da9264c8966b68c99be1f2d0a598fb8fc5e22bdd
push id8261
push userarmenzg@mozilla.com
push dateThu, 23 Oct 2014 21:16:46 +0000 (2014-10-23)
reviewerscatlee
bugs1088044
Bug 1088044 - Enable Win64 PGO builds and tests. r=catlee
mozilla-tests/config.py
mozilla-tests/config_common.py
mozilla/config.py
--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -120,22 +120,19 @@ PLATFORMS['win32']['mozharness_config'] 
     'hg_bin': 'c:\\mozilla-build\\hg\\hg',
     'reboot_command': ['c:/mozilla-build/python27/python', '-u'] + MOZHARNESS_REBOOT_CMD,
     'system_bits': '32',
     'config_file': 'talos/windows_config.py',
 }
 
 PLATFORMS['win64']['slave_platforms'] = ['win8_64']
 PLATFORMS['win64']['talos_slave_platforms'] = ['win8_64']
-PLATFORMS['win64']['win8_64'] = {'name': 'Windows 8 64-bit'}
 PLATFORMS['win64']['env_name'] = 'win64-perf'
 PLATFORMS['win64']['stage_product'] = 'firefox'
-PLATFORMS['win64']['win8_64']['mozharness_config'] = {
-    'mozharness_python': ['c:/mozilla-build/python27/python', '-u'],
-}
+PLATFORMS['win64']['win8_64'] = {'name': 'Windows 8 64-bit'}
 PLATFORMS['win64']['mozharness_config'] = {
     'mozharness_python': ['c:/mozilla-build/python27/python', '-u'],
     'hg_bin': 'c:\\mozilla-build\\hg\\hg',
     'reboot_command': ['c:/mozilla-build/python27/python', '-u'] + MOZHARNESS_REBOOT_CMD,
     'system_bits': '64',
     'config_file': 'talos/windows_config.py',
 }
 
--- a/mozilla-tests/config_common.py
+++ b/mozilla-tests/config_common.py
@@ -10,17 +10,17 @@ def loadDefaultValues(BRANCHES, branch, 
     BRANCHES[branch]['mobile_branch_name'] = branch.title()
     BRANCHES[branch]['talos_command'] = branchConfig.get('talos_cmd', TALOS_CMD)
     BRANCHES[branch]['fetch_symbols'] = branchConfig.get('fetch_symbols', True)
     BRANCHES[branch]['fetch_release_symbols'] = branchConfig.get('fetch_release_symbols', False)
     BRANCHES[branch]['talos_from_source_code'] = branchConfig.get('talos_from_source_code', True)
     BRANCHES[branch]['support_url_base'] = branchConfig.get('support_url_base', 'http://talos-bundles.pvt.build.mozilla.org')
     BRANCHES[branch]['enable_unittests'] = branchConfig.get('enable_unittests', True)
     BRANCHES[branch]['pgo_strategy'] = branchConfig.get('pgo_strategy', None)
-    BRANCHES[branch]['pgo_platforms'] = branchConfig.get('pgo_platforms', ['linux', 'linux64', 'win32'])
+    BRANCHES[branch]['pgo_platforms'] = branchConfig.get('pgo_platforms', ['linux', 'linux64', 'win32', 'win64'])
     BRANCHES[branch]['mozharness_talos'] = True
 
 
 def loadCustomTalosSuites(BRANCHES, SUITES, branch, branchConfig):
     coallesceJobs = branchConfig.get('coallesce_jobs', True)
     BRANCHES[branch]['suites'] = deepcopy(SUITES)
     # Check if Talos is enabled, if False, set 0 runs for all suites
     if branchConfig.get('enable_talos') is False:
--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -70,17 +70,17 @@ GLOBAL_VARS = {
         'win32-debug': {},
         'win64-debug': {},
         'android': {},
         'android-x86': {},
         'android-armv6': {},
         'android-debug': {},
     },
     'pgo_strategy': None,
-    'pgo_platforms': ('linux', 'linux64', 'win32',),
+    'pgo_platforms': ('linux', 'linux64', 'win32', 'win64',),
     'periodic_start_hours': range(0, 24, 6),
     'enable_blocklist_update': False,
     'enable_hsts_update': False,
     'enable_hpkp_update': False,
     'file_update_on_closed_tree': False,
     'file_update_set_approval': True,
     'enable_nightly': True,
     'enabled_products': ['firefox', 'mobile'],