Bug 1314678 - Add variants for OS X cross artifact builds in mozharness. r=maja_zf

MozReview-Commit-ID: 6XLg7NsCsMr

--HG--
extra : rebase_source : 4da8e07c1913b1bbbc8a0e16a49bf09e06b522da

testing/mozharness/configs/builds/releng_base_mac_64_cross_builds.py

@@ -79,5 +79,6 @@ config = {
     },
     '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',
     #########################################################################
 }

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',
+}

testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_debug.py

@@ -39,5 +39,6 @@ config = {
         ##
     },
     'src_mozconfig': 'browser/config/mozconfigs/macosx64/debug',
+    'artifact_flag_build_variant_in_try': 'cross-debug-artifact',
     #######################
 }

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',
+}

testing/mozharness/mozharness/mozilla/building/buildbase.py

@@ -349,8 +349,10 @@ class BuildOptionParser(object):
         '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',