bug 1198190 - Support cross-debug as a build variant, copy 64_debug mac sub-config to 64_cross_debug, disable check tests on mac-cross. r=jlund
authorTed Mielczarek <ted@mielczarek.org>
Mon, 24 Aug 2015 12:38:13 -0400
changeset 261888 eaa94ea819ee26a8250bf18ad744c3143be8aa84
parent 261887 af1a3e372a031412b70532c217a88cb25fd21ece
child 261889 673aec9df33d138692845be1e7eb68da72ab966a
push id29355
push usercbook@mozilla.com
push dateFri, 11 Sep 2015 14:37:04 +0000
treeherderautoland@19f806034f67 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjlund
bugs1198190
milestone43.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 1198190 - Support cross-debug as a build variant, copy 64_debug mac sub-config to 64_cross_debug, disable check tests on mac-cross. r=jlund
testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_debug.py
testing/mozharness/mozharness/mozilla/building/buildbase.py
testing/taskcluster/tasks/builds/dbg_macosx64.yml
copy from testing/mozharness/configs/builds/releng_sub_mac_configs/64_debug.py
copy to testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_debug.py
--- a/testing/mozharness/configs/builds/releng_sub_mac_configs/64_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_debug.py
@@ -6,17 +6,16 @@ config = {
     'default_actions': [
         'clobber',
         'clone-tools',
         'checkout-sources',
         # 'setup-mock',
         'build',
         'upload-files',
         'sendchange',
-        'check-test',
         # 'generate-build-stats',
         'update',  # decided by query_is_nightly()
     ],
     'stage_platform': 'macosx64-debug',
     'debug_build': True,
     'objdir': 'obj-firefox',
     'enable_talos_sendchange': False,
     #### 64 bit build specific #####
--- a/testing/mozharness/mozharness/mozilla/building/buildbase.py
+++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py
@@ -306,16 +306,17 @@ class BuildOptionParser(object):
     # and the script will pull up the appropriate path for the config
     # against the current platform and bits.
     # *It will warn and fail if there is not a config for the current
     # platform/bits
     build_variants = {
         'asan': 'builds/releng_sub_%s_configs/%s_asan.py',
         'tsan': 'builds/releng_sub_%s_configs/%s_tsan.py',
         'b2g-debug': 'b2g/releng_sub_%s_configs/%s_debug.py',
+        'cross-debug': 'builds/releng_sub_%s_configs/%s_cross_debug.py',
         'debug': 'builds/releng_sub_%s_configs/%s_debug.py',
         'asan-and-debug': 'builds/releng_sub_%s_configs/%s_asan_and_debug.py',
         'stat-and-debug': 'builds/releng_sub_%s_configs/%s_stat_and_debug.py',
         'mulet': 'builds/releng_sub_%s_configs/%s_mulet.py',
         'code-coverage': 'builds/releng_sub_%s_configs/%s_code_coverage.py',
         'graphene': 'builds/releng_sub_%s_configs/%s_graphene.py',
         'horizon': 'builds/releng_sub_%s_configs/%s_horizon.py',
         'source': 'builds/releng_sub_%s_configs/%s_source.py',
--- a/testing/taskcluster/tasks/builds/dbg_macosx64.yml
+++ b/testing/taskcluster/tasks/builds/dbg_macosx64.yml
@@ -7,16 +7,16 @@ task:
   metadata:
       name: '[TC] MacOSX64 Dbg'
       description: 'MacOSX64 Dbg'
 
   workerType: dbg-macosx64
 
   payload:
     env:
-      MH_CUSTOM_BUILD_VARIANT_CFG: 'debug'
+      MH_CUSTOM_BUILD_VARIANT_CFG: 'cross-debug'
   extra:
     treeherder:
       groupSymbol: tc
       groupName: Submitted by taskcluster
       symbol: B
       collection:
         debug: true