Bug 1314679 - Remove inherited mh config to support tc win artifact builds. r=chmanchester
authorRob Thijssen <rthijssen@mozilla.com>
Fri, 25 Nov 2016 12:30:09 +0000
changeset 324829 4b304f6f7c92f39b19981f7df1f47e1da1a60c3f
parent 324828 44b646931108d26523bd03d8887a26894cd08749
child 324830 a9e5f427832d0380e4f25094ed8ac2310733671c
push id24
push usermaklebus@msu.edu
push dateTue, 20 Dec 2016 03:11:33 +0000
reviewerschmanchester
bugs1314679
milestone53.0a1
Bug 1314679 - Remove inherited mh config to support tc win artifact builds. r=chmanchester MozReview-Commit-ID: u5zCj9Sg4r
testing/mozharness/configs/builds/releng_sub_windows_configs/32_artifact.py
testing/mozharness/configs/builds/releng_sub_windows_configs/32_debug_artifact.py
testing/mozharness/configs/builds/releng_sub_windows_configs/64_artifact.py
testing/mozharness/configs/builds/releng_sub_windows_configs/64_debug_artifact.py
--- a/testing/mozharness/configs/builds/releng_sub_windows_configs/32_artifact.py
+++ b/testing/mozharness/configs/builds/releng_sub_windows_configs/32_artifact.py
@@ -1,82 +1,7 @@
 import os
 import sys
 
 config = {
-    #########################################################################
-    ######## WINDOWS GENERIC CONFIG KEYS/VAlUES
-    # if you are updating this with custom 32 bit keys/values please add them
-    # below under the '32 bit specific' code block otherwise, update in this
-    # code block and also make sure this is synced with
-    # releng_base_windows_32_builds.py
-
-    'default_actions': [
-        'clobber',
-        'clone-tools',
-        'checkout-sources',
-        # 'setup-mock', windows do not use mock
-        'build',
-        'sendchange',
-    ],
-    "buildbot_json_path": "buildprops.json",
-    'exes': {
-        'python2.7': sys.executable,
-        "buildbot": [
-            sys.executable,
-            'c:\\mozilla-build\\buildbotve\\scripts\\buildbot'
-        ],
-        "make": [
-            sys.executable,
-            os.path.join(
-                os.getcwd(), 'build', 'src', 'build', 'pymake', 'make.py'
-            )
-        ],
-        'virtualenv': [
-            sys.executable,
-            'c:/mozilla-build/buildbotve/virtualenv.py'
-        ],
-    },
-    'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
-    # decides whether we want to use moz_sign_cmd in env
-    'enable_signing': False,
-    'enable_ccache': False,
-    'vcs_share_base': 'C:/builds/hg-shared',
-    'objdir': 'obj-firefox',
-    'tooltool_script': [sys.executable,
-                        'C:/mozilla-build/tooltool.py'],
-    'tooltool_bootstrap': "setup.sh",
-    'enable_count_ctors': False,
-    'enable_talos_sendchange': False,
-    # allows triggering of test jobs when --artifact try syntax is detected on buildbot
-    'enable_unittest_sendchange': True,
-    'max_build_output_timeout': 60 * 80,
-    'perfherder_extra_options': ['artifact'],
-    #########################################################################
-
-
-     #########################################################################
-     ###### 32 bit specific ######
     'base_name': 'WINNT_5.2_%(branch)s_Artifact_build',
-    'platform': 'win32',
-    'stage_platform': 'win32',
-    'publish_nightly_en_US_routes': False,
-    'env': {
-        'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
-        'MOZ_AUTOMATION': '1',
-        'BINSCOPE': 'C:/Program Files (x86)/Microsoft/SDL BinScope/BinScope.exe',
-        'HG_SHARE_BASE_DIR': 'C:/builds/hg-shared',
-        'MOZ_CRASHREPORTER_NO_REPORT': '1',
-        'MOZ_OBJDIR': 'obj-firefox',
-        'PATH': 'C:/mozilla-build/nsis-3.0b1;C:/mozilla-build/python27;'
-                'C:/mozilla-build/buildbotve/scripts;'
-                '%s' % (os.environ.get('path')),
-        'PDBSTR_PATH': '/c/Program Files (x86)/Windows Kits/8.0/Debuggers/x64/srcsrv/pdbstr.exe',
-        'PROPERTIES_FILE': os.path.join(os.getcwd(), 'buildprops.json'),
-        'TINDERBOX_OUTPUT': '1',
-        'TOOLTOOL_CACHE': '/c/builds/tooltool_cache',
-        'TOOLTOOL_HOME': '/c/builds',
-    },
-    'enable_pymake': True,
     'src_mozconfig': 'browser/config/mozconfigs/win32/artifact',
-    'tooltool_manifest_src': "browser/config/tooltool-manifests/win32/releng.manifest",
-    #########################################################################
 }
--- a/testing/mozharness/configs/builds/releng_sub_windows_configs/32_debug_artifact.py
+++ b/testing/mozharness/configs/builds/releng_sub_windows_configs/32_debug_artifact.py
@@ -1,87 +1,7 @@
 import os
 import sys
 
-MOZ_OBJDIR = 'obj-firefox'
-
 config = {
-    #########################################################################
-    ######## WINDOWS GENERIC CONFIG KEYS/VAlUES
-    # if you are updating this with custom 32 bit keys/values please add them
-    # below under the '32 bit specific' code block otherwise, update in this
-    # code block and also make sure this is synced with
-    # releng_base_windows_32_builds.py
-
-    'default_actions': [
-        'clobber',
-        'clone-tools',
-        'checkout-sources',
-        # 'setup-mock', windows do not use mock
-        'build',
-        'sendchange',
-    ],
-    "buildbot_json_path": "buildprops.json",
-    'exes': {
-        'python2.7': sys.executable,
-        "buildbot": [
-            sys.executable,
-            'c:\\mozilla-build\\buildbotve\\scripts\\buildbot'
-        ],
-        "make": [
-            sys.executable,
-            os.path.join(
-                os.getcwd(), 'build', 'src', 'build', 'pymake', 'make.py'
-            )
-        ],
-        'virtualenv': [
-            sys.executable,
-            'c:/mozilla-build/buildbotve/virtualenv.py'
-        ],
-    },
-    'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
-    # decides whether we want to use moz_sign_cmd in env
-    'enable_signing': False,
-    'enable_ccache': False,
-    'vcs_share_base': 'C:/builds/hg-shared',
-    'objdir': MOZ_OBJDIR,
-    'tooltool_script': [sys.executable,
-                        'C:/mozilla-build/tooltool.py'],
-    'tooltool_bootstrap': "setup.sh",
-    'enable_count_ctors': False,
-    # debug specific
-    'debug_build': True,
-    'enable_talos_sendchange': False,
-    # allows triggering of test jobs when --artifact try syntax is detected on buildbot
-    'enable_unittest_sendchange': True,
-    'max_build_output_timeout': 60 * 80,
-    'perfherder_extra_options': ['artifact'],
-    #########################################################################
-
-
-     #########################################################################
-     ###### 32 bit specific ######
     'base_name': 'WINNT_5.2_%(branch)s_Artifact_build',
-    'platform': 'win32',
-    'stage_platform': 'win32-debug',
-    'publish_nightly_en_US_routes': False,
-    'env': {
-        'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
-        'MOZ_AUTOMATION': '1',
-        'BINSCOPE': 'C:/Program Files (x86)/Microsoft/SDL BinScope/BinScope.exe',
-        'HG_SHARE_BASE_DIR': 'C:/builds/hg-shared',
-        'MOZ_CRASHREPORTER_NO_REPORT': '1',
-        'MOZ_OBJDIR': MOZ_OBJDIR,
-        'PATH': 'C:/mozilla-build/nsis-3.0b1;C:/mozilla-build/python27;'
-                'C:/mozilla-build/buildbotve/scripts;'
-                '%s' % (os.environ.get('path')),
-        'PROPERTIES_FILE': os.path.join(os.getcwd(), 'buildprops.json'),
-        'TINDERBOX_OUTPUT': '1',
-        'TOOLTOOL_CACHE': '/c/builds/tooltool_cache',
-        'TOOLTOOL_HOME': '/c/builds',
-        # debug-specific
-        'XPCOM_DEBUG_BREAK': 'stack-and-abort',
-    },
-    'enable_pymake': True,
     'src_mozconfig': 'browser/config/mozconfigs/win32/debug-artifact',
-    'tooltool_manifest_src': "browser/config/tooltool-manifests/win32/releng.manifest",
-    #########################################################################
 }
--- a/testing/mozharness/configs/builds/releng_sub_windows_configs/64_artifact.py
+++ b/testing/mozharness/configs/builds/releng_sub_windows_configs/64_artifact.py
@@ -1,79 +1,7 @@
 import os
 import sys
 
 config = {
-    #########################################################################
-    ######## WINDOWS GENERIC CONFIG KEYS/VAlUES
-    # if you are updating this with custom 32 bit keys/values please add them
-    # below under the '32 bit specific' code block otherwise, update in this
-    # code block and also make sure this is synced with
-    # releng_base_windows_64_builds.py
-
-    'default_actions': [
-        'clobber',
-        'clone-tools',
-        'checkout-sources',
-        # 'setup-mock', windows do not use mock
-        'build',
-        'sendchange',
-    ],
-    "buildbot_json_path": "buildprops.json",
-    'exes': {
-        'python2.7': sys.executable,
-        "buildbot": [
-            sys.executable,
-            'c:\\mozilla-build\\buildbotve\\scripts\\buildbot'
-        ],
-        "make": [
-            sys.executable,
-            os.path.join(
-                os.getcwd(), 'build', 'src', 'build', 'pymake', 'make.py'
-            )
-        ],
-        'virtualenv': [
-            sys.executable,
-            'c:/mozilla-build/buildbotve/virtualenv.py'
-        ],
-    },
-    'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
-    # decides whether we want to use moz_sign_cmd in env
-    'enable_signing': False,
-    'enable_ccache': False,
-    'vcs_share_base': 'C:/builds/hg-shared',
-    'objdir': 'obj-firefox',
-    'tooltool_script': [sys.executable,
-                        'C:/mozilla-build/tooltool.py'],
-    'tooltool_bootstrap': "setup.sh",
-    'enable_count_ctors': False,
-    'enable_talos_sendchange': False,
-    # allows triggering of test jobs when --artifact try syntax is detected on buildbot
-    'enable_unittest_sendchange': True,
-    'max_build_output_timeout': 60 * 80,
-    #########################################################################
-
-
-     #########################################################################
-     ###### 64 bit specific ######
     'base_name': 'WINNT_6.1_x86-64_%(branch)s_Artifact_build',
-    'platform': 'win64',
-    'stage_platform': 'win64',
-    'publish_nightly_en_US_routes': False,
-    'env': {
-        'MOZ_AUTOMATION': '1',
-        'HG_SHARE_BASE_DIR': 'C:/builds/hg-shared',
-        'MOZ_CRASHREPORTER_NO_REPORT': '1',
-        'MOZ_OBJDIR': 'obj-firefox',
-        'PATH': 'C:/mozilla-build/nsis-3.0b1;C:/mozilla-build/python27;'
-                'C:/mozilla-build/buildbotve/scripts;'
-                '%s' % (os.environ.get('path')),
-        'PDBSTR_PATH': '/c/Program Files (x86)/Windows Kits/8.0/Debuggers/x64/srcsrv/pdbstr.exe',
-        'PROPERTIES_FILE': os.path.join(os.getcwd(), 'buildprops.json'),
-        'TINDERBOX_OUTPUT': '1',
-        'TOOLTOOL_CACHE': '/c/builds/tooltool_cache',
-        'TOOLTOOL_HOME': '/c/builds',
-    },
-    'enable_pymake': True,
     'src_mozconfig': 'browser/config/mozconfigs/win64/artifact',
-    'tooltool_manifest_src': "browser/config/tooltool-manifests/win64/releng.manifest",
-    #########################################################################
 }
--- a/testing/mozharness/configs/builds/releng_sub_windows_configs/64_debug_artifact.py
+++ b/testing/mozharness/configs/builds/releng_sub_windows_configs/64_debug_artifact.py
@@ -1,85 +1,7 @@
 import os
 import sys
 
-MOZ_OBJDIR = 'obj-firefox'
-
 config = {
-    #########################################################################
-    ######## WINDOWS GENERIC CONFIG KEYS/VAlUES
-    # if you are updating this with custom 32 bit keys/values please add them
-    # below under the '32 bit specific' code block otherwise, update in this
-    # code block and also make sure this is synced with
-    # releng_base_windows_64_builds.py
-
-    'default_actions': [
-        'clobber',
-        'clone-tools',
-        'checkout-sources',
-        # 'setup-mock', windows do not use mock
-        'build',
-        'sendchange',
-    ],
-    "buildbot_json_path": "buildprops.json",
-    'exes': {
-        'python2.7': sys.executable,
-        "buildbot": [
-            sys.executable,
-            'c:\\mozilla-build\\buildbotve\\scripts\\buildbot'
-        ],
-        "make": [
-            sys.executable,
-            os.path.join(
-                os.getcwd(), 'build', 'src', 'build', 'pymake', 'make.py'
-            )
-        ],
-        'virtualenv': [
-            sys.executable,
-            'c:/mozilla-build/buildbotve/virtualenv.py'
-        ],
-    },
-    'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
-    # decides whether we want to use moz_sign_cmd in env
-    'enable_signing': False,
-    'enable_ccache': False,
-    'vcs_share_base': 'C:/builds/hg-shared',
-    'objdir': MOZ_OBJDIR,
-    'tooltool_script': [sys.executable,
-                        'C:/mozilla-build/tooltool.py'],
-    'tooltool_bootstrap': "setup.sh",
-    'enable_count_ctors': False,
-    # debug specific
-    'debug_build': True,
-    'enable_talos_sendchange': False,
-    # allows triggering of test jobs when --artifact try syntax is detected on buildbot
-    'enable_unittest_sendchange': True,
-    'max_build_output_timeout': 60 * 80,
-    #########################################################################
-
-
-     #########################################################################
-     ###### 64 bit specific ######
     'base_name': 'WINNT_6.1_x86-64_%(branch)s_Artifact_build',
-    'platform': 'win64',
-    'stage_platform': 'win64-debug',
-    'publish_nightly_en_US_routes': False,
-    'env': {
-        'BINSCOPE': 'C:/Program Files (x86)/Microsoft/SDL BinScope/BinScope.exe',
-        'MOZ_AUTOMATION': '1',
-        'HG_SHARE_BASE_DIR': 'C:/builds/hg-shared',
-        'MOZ_CRASHREPORTER_NO_REPORT': '1',
-        'MOZ_OBJDIR': MOZ_OBJDIR,
-        'PATH': 'C:/mozilla-build/nsis-3.0b1;C:/mozilla-build/python27;'
-                'C:/mozilla-build/buildbotve/scripts;'
-                '%s' % (os.environ.get('path')),
-        'PROPERTIES_FILE': os.path.join(os.getcwd(), 'buildprops.json'),
-        'TINDERBOX_OUTPUT': '1',
-        'TOOLTOOL_CACHE': '/c/builds/tooltool_cache',
-        'TOOLTOOL_HOME': '/c/builds',
-        # debug-specific
-        'XPCOM_DEBUG_BREAK': 'stack-and-abort',
-    },
-    'enable_pymake': True,
     'src_mozconfig': 'browser/config/mozconfigs/win64/debug-artifact',
-    'tooltool_manifest_src': "browser/config/tooltool-manifests/win64/releng.manifest",
-    #########################################################################
 }