Bug 1094364 - switch win64 builds to use mozharness mach, r=catlee
authorJordan Lund <jlund@mozilla.com>
Thu, 05 Mar 2015 22:58:16 -0800 (2015-03-06)
changeset 11938 b895db57d5a1f62461324abdc59839b5f8fe347c
parent 11937 581d2907e2e3e6fe5ba88ca3fb9c6b54bc5bcaa8
child 11939 dedf55f00d802d7cd5c009a6dbb78f45f61aa063
push id8660
push userjlund@mozilla.com
push dateFri, 06 Mar 2015 06:58:24 +0000 (2015-03-06)
reviewerscatlee
bugs1094364
Bug 1094364 - switch win64 builds to use mozharness mach, r=catlee
mozilla/config.py
mozilla/project_branches.py
--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -942,16 +942,24 @@ PLATFORM_VARS = {
             'nightly_signing_servers': 'dep-signing',
             'dep_signing_servers': 'dep-signing',
             'tooltool_manifest_src': 'browser/config/tooltool-manifests/win32/releng.manifest',
             'tooltool_l10n_manifest_src': 'browser/config/tooltool-manifests/win32/l10n.manifest',
             'tooltool_script': ['python', '/c/mozilla-build/tooltool.py'],
         },
         'win64': {
             'mozharness_python': ['c:/mozilla-build/python27/python', '-u'],
+            'mozharness_desktop_build': {
+                'script_name': 'scripts/fx_desktop_build.py',
+                'extra_args': [
+                    '--config', 'builds/releng_base_windows_64_builds.py',
+                ],
+                'script_timeout': 3 * 3600,
+                'script_maxtime': int(5.5 * 3600),
+            },
             'mozharness_desktop_l10n': {
                 'capable': False,
                 'scriptName': 'scripts/desktop_l10n.py',
                 'l10n_chunks': 3,
                 'use_credentials_file': True,
             },
             'reboot_command': [
                 'c:/mozilla-build/python27/python', '-u',
@@ -1356,16 +1364,25 @@ PLATFORM_VARS = {
             'talos_masters': None,
             'nightly_signing_servers': 'dep-signing',
             'dep_signing_servers': 'dep-signing',
             'tooltool_manifest_src': 'browser/config/tooltool-manifests/win32/releng.manifest',
             'tooltool_script': ['python', '/c/mozilla-build/tooltool.py'],
         },
         'win64-debug': {
             'mozharness_python': ['c:/mozilla-build/python27/python', '-u'],
+            'mozharness_desktop_build': {
+                'script_name': 'scripts/fx_desktop_build.py',
+                'extra_args': [
+                    '--config', 'builds/releng_base_windows_64_builds.py',
+                    '--custom-build-variant-cfg', 'debug',
+                ],
+                'script_timeout': 3 * 3600,
+                'script_maxtime': int(5.5 * 3600),
+            },
             'reboot_command': [
                 'c:/mozilla-build/python27/python', '-u',
                 'scripts/external_tools/count_and_reboot.py',
                 '-f', '../reboot_count.txt','-n', '1', '-z'
             ],
             'enable_nightly': False,
             'enable_xulrunner': False,
             'product_name': 'firefox',
--- a/mozilla/project_branches.py
+++ b/mozilla/project_branches.py
@@ -114,43 +114,16 @@ PROJECT_BRANCHES = {
             'xperf': 1,
         },
         'enable_opt_unittests': True,
         'mobile_platforms': {
             'android-x86': {
                 'enable_opt_unittests': True,
             },
         },
-        'platforms': {
-            # Bug 1094364 - switch win64 builds to use mozharness mach
-            #   testing on cedar first. to land across trunk: remove below and add to:
-            # win64 - http://hg.mozilla.org/build/buildbot-configs/file/828d626c2603/mozilla/config.py#l948
-            # win64-debug - http://hg.mozilla.org/build/buildbot-configs/file/828d626c2603/mozilla/config.py#l1362
-            'win64': {
-                'mozharness_desktop_build': {
-                    'script_name': 'scripts/fx_desktop_build.py',
-                    'extra_args': [
-                        '--config', 'builds/releng_base_windows_64_builds.py',
-                    ],
-                    'script_timeout': 3 * 3600,
-                    'script_maxtime': int(5.5 * 3600),
-                },
-            },
-            'win64-debug': {
-                'mozharness_desktop_build': {
-                    'script_name': 'scripts/fx_desktop_build.py',
-                    'extra_args': [
-                        '--config', 'builds/releng_base_windows_64_builds.py',
-                        '--custom-build-variant-cfg', 'debug',
-                    ],
-                    'script_timeout': 3 * 3600,
-                    'script_maxtime': int(5.5 * 3600),
-                },
-            }
-        },
     },
     'cypress': {
         'enable_perproduct_builds': False,
         'enable_talos': True,
     },
     'date': {
         'gecko_version': 37,
         'mozharness_repo_path': 'users/nthomas_mozilla.com/mozharness-build-promotion',