Bug 1314678 - Add variants for OS X cross artifact builds in mozharness. r=maja_zf
MozReview-Commit-ID: 6XLg7NsCsMr
--- a/testing/mozharness/configs/builds/releng_base_mac_64_cross_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_mac_64_cross_builds.py
@@ -74,10 +74,11 @@ config = {
'UPLOAD_TO_TEMP': '1',
},
"check_test_env": {
'MINIDUMP_STACKWALK': '%(abs_tools_dir)s/breakpad/linux64/minidump_stackwalk',
'MINIDUMP_SAVE_PATH': '%(base_work_dir)s/minidumps',
},
'src_mozconfig': 'browser/config/mozconfigs/macosx64/nightly',
'tooltool_manifest_src': 'browser/config/tooltool-manifests/macosx64/cross-releng.manifest',
+ 'artifact_flag_build_variant_in_try': 'cross-artifact',
#########################################################################
}
new file mode 100644
--- /dev/null
+++ b/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_artifact.py
@@ -0,0 +1,4 @@
+config = {
+ 'perfherder_extra_options': ['artifact'],
+ 'src_mozconfig': 'browser/config/mozconfigs/macosx64/artifact',
+}
--- a/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_debug.py
@@ -34,10 +34,11 @@ config = {
'LC_ALL': 'C',
'XPCOM_DEBUG_BREAK': 'stack-and-abort',
## 64 bit specific
'PATH': '/tools/python/bin:/tools/buildbot/bin:/opt/local/bin:/usr/bin:'
'/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin',
##
},
'src_mozconfig': 'browser/config/mozconfigs/macosx64/debug',
+ 'artifact_flag_build_variant_in_try': 'cross-debug-artifact',
#######################
}
new file mode 100644
--- /dev/null
+++ b/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_debug_artifact.py
@@ -0,0 +1,4 @@
+config = {
+ 'perfherder_extra_options': ['artifact'],
+ 'src_mozconfig': 'browser/config/mozconfigs/macosx64/debug-artifact',
+}
--- a/testing/mozharness/mozharness/mozilla/building/buildbase.py
+++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py
@@ -344,18 +344,20 @@ class BuildOptionParser(object):
# platform/bits
build_variants = {
'add-on-devel': 'builds/releng_sub_%s_configs/%s_add-on-devel.py',
'asan': 'builds/releng_sub_%s_configs/%s_asan.py',
'asan-tc': 'builds/releng_sub_%s_configs/%s_asan_tc.py',
'tsan': 'builds/releng_sub_%s_configs/%s_tsan.py',
'cross-debug': 'builds/releng_sub_%s_configs/%s_cross_debug.py',
'cross-debug-st-an': 'builds/releng_sub_%s_configs/%s_cross_debug_st_an.py',
+ 'cross-debug-artifact': 'builds/releng_sub_%s_configs/%s_cross_debug_artifact.py',
'cross-opt-st-an': 'builds/releng_sub_%s_configs/%s_cross_opt_st_an.py',
'cross-universal': 'builds/releng_sub_%s_configs/%s_cross_universal.py',
+ 'cross-artifact': 'builds/releng_sub_%s_configs/%s_cross_artifact.py',
'cross-qr-debug': 'builds/releng_sub_%s_configs/%s_cross_qr_debug.py',
'cross-qr-opt': 'builds/releng_sub_%s_configs/%s_cross_qr_opt.py',
'debug': 'builds/releng_sub_%s_configs/%s_debug.py',
'asan-and-debug': 'builds/releng_sub_%s_configs/%s_asan_and_debug.py',
'asan-tc-and-debug': 'builds/releng_sub_%s_configs/%s_asan_tc_and_debug.py',
'stat-and-debug': 'builds/releng_sub_%s_configs/%s_stat_and_debug.py',
'code-coverage': 'builds/releng_sub_%s_configs/%s_code_coverage.py',
'source': 'builds/releng_sub_%s_configs/%s_source.py',