Bug 1357562 - Prevent windows clang builds from being replaced by an artifact build. r=nalexander draft
authorChris Manchester <cmanchester@mozilla.com>
Tue, 25 Apr 2017 16:18:43 -0700
changeset 568944 a82323616c8266a6e7d4d82fde0da441da3cc3f3
parent 568943 431d7f6df1136a20ed5796c23832879c5be99790
child 626071 90ca026ab3de92d81389510239376d7ebd08fb55
push id56028
push userbmo:cmanchester@mozilla.com
push dateWed, 26 Apr 2017 19:30:22 +0000
reviewersnalexander
bugs1357562
milestone55.0a1
Bug 1357562 - Prevent windows clang builds from being replaced by an artifact build. r=nalexander These builds do not have a distinct variant and they do not have an artifact build equivalent, so specify this in their respective mozharness configs. MozReview-Commit-ID: CHMglUoP8LR
testing/mozharness/configs/builds/releng_sub_windows_configs/32_stat_and_debug.py
testing/mozharness/configs/builds/taskcluster_firefox_win32_clang.py
testing/mozharness/configs/builds/taskcluster_firefox_win32_clang_debug.py
testing/mozharness/configs/builds/taskcluster_firefox_win64_clang.py
testing/mozharness/configs/builds/taskcluster_firefox_win64_clang_debug.py
--- a/testing/mozharness/configs/builds/releng_sub_windows_configs/32_stat_and_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_windows_configs/32_stat_and_debug.py
@@ -36,10 +36,11 @@ clang.manifest",
         'PROPERTIES_FILE': os.path.join(os.getcwd(), 'buildprops.json'),
         'TINDERBOX_OUTPUT': '1',
         'XPCOM_DEBUG_BREAK': 'stack-and-abort',
         'TOOLTOOL_CACHE': 'c:/builds/tooltool_cache',
         'TOOLTOOL_HOME': '/c/builds',
     },
     'src_mozconfig': 'browser/config/mozconfigs/win32/debug-static-analysis',
     'purge_minsize': 9,
+    'artifact_flag_build_variant_in_try': None,
     #######################
 }
--- a/testing/mozharness/configs/builds/taskcluster_firefox_win32_clang.py
+++ b/testing/mozharness/configs/builds/taskcluster_firefox_win32_clang.py
@@ -84,10 +84,11 @@ config = {
     },
     "check_test_env": {
         'MINIDUMP_STACKWALK': '%(abs_tools_dir)s\\breakpad\\win32\\minidump_stackwalk.exe',
         'MINIDUMP_SAVE_PATH': '%(base_work_dir)s\\minidumps',
     },
     'enable_pymake': True,
     'src_mozconfig': 'browser\\config\\mozconfigs\\win32\\clang',
     'tooltool_manifest_src': 'browser\\config\\tooltool-manifests\\win32\\clang.manifest',
+    'artifact_flag_build_variant_in_try': None,
     #########################################################################
 }
--- a/testing/mozharness/configs/builds/taskcluster_firefox_win32_clang_debug.py
+++ b/testing/mozharness/configs/builds/taskcluster_firefox_win32_clang_debug.py
@@ -86,10 +86,11 @@ config = {
     },
     "check_test_env": {
         'MINIDUMP_STACKWALK': '%(abs_tools_dir)s\\breakpad\\win32\\minidump_stackwalk.exe',
         'MINIDUMP_SAVE_PATH': '%(base_work_dir)s\\minidumps',
     },
     'enable_pymake': True,
     'src_mozconfig': 'browser\\config\\mozconfigs\\win32\\clang-debug',
     'tooltool_manifest_src': 'browser\\config\\tooltool-manifests\\win32\\clang.manifest',
+    'artifact_flag_build_variant_in_try': None,
     #########################################################################
 }
--- a/testing/mozharness/configs/builds/taskcluster_firefox_win64_clang.py
+++ b/testing/mozharness/configs/builds/taskcluster_firefox_win64_clang.py
@@ -80,10 +80,11 @@ config = {
     },
     "check_test_env": {
         'MINIDUMP_STACKWALK': '%(abs_tools_dir)s\\breakpad\\win64\\minidump_stackwalk.exe',
         'MINIDUMP_SAVE_PATH': '%(base_work_dir)s\\minidumps',
     },
     'enable_pymake': True,
     'src_mozconfig': 'browser\\config\\mozconfigs\\win64\\clang',
     'tooltool_manifest_src': 'browser\\config\\tooltool-manifests\\win64\\clang.manifest',
+    'artifact_flag_build_variant_in_try': None,
     #########################################################################
 }
--- a/testing/mozharness/configs/builds/taskcluster_firefox_win64_clang_debug.py
+++ b/testing/mozharness/configs/builds/taskcluster_firefox_win64_clang_debug.py
@@ -82,10 +82,11 @@ config = {
     },
     "check_test_env": {
         'MINIDUMP_STACKWALK': '%(abs_tools_dir)s\\breakpad\\win64\\minidump_stackwalk.exe',
         'MINIDUMP_SAVE_PATH': '%(base_work_dir)s\\minidumps',
     },
     'enable_pymake': True,
     'src_mozconfig': 'browser\\config\\mozconfigs\\win64\\clang-debug',
     'tooltool_manifest_src': 'browser\\config\\tooltool-manifests\\win64\\clang.manifest',
+    'artifact_flag_build_variant_in_try': None,
     #########################################################################
 }