From 96f55718c43f6b0a12e9b0e333fa1bce40dceb70 Mon Sep 17 00:00:00 2001
From: Chris Manchester <cmanchester@mozilla.com>
Date: Tue, 25 Apr 2017 16:18:43 -0700
Subject: [PATCH] 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

--HG--
extra : rebase_source : a82323616c8266a6e7d4d82fde0da441da3cc3f3
---
 .../builds/releng_sub_windows_configs/32_stat_and_debug.py       | 1 +
 .../mozharness/configs/builds/taskcluster_firefox_win32_clang.py | 1 +
 .../configs/builds/taskcluster_firefox_win32_clang_debug.py      | 1 +
 .../mozharness/configs/builds/taskcluster_firefox_win64_clang.py | 1 +
 .../configs/builds/taskcluster_firefox_win64_clang_debug.py      | 1 +
 5 files changed, 5 insertions(+)

diff --git 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
index a44c1085a7fa..e364e339fc4f 100644
--- 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
@@ -41,5 +41,6 @@ clang.manifest",
     },
     'src_mozconfig': 'browser/config/mozconfigs/win32/debug-static-analysis',
     'purge_minsize': 9,
+    'artifact_flag_build_variant_in_try': None,
     #######################
 }
diff --git a/testing/mozharness/configs/builds/taskcluster_firefox_win32_clang.py b/testing/mozharness/configs/builds/taskcluster_firefox_win32_clang.py
index 5e067f55e0b2..d42d59514a9c 100644
--- a/testing/mozharness/configs/builds/taskcluster_firefox_win32_clang.py
+++ b/testing/mozharness/configs/builds/taskcluster_firefox_win32_clang.py
@@ -89,5 +89,6 @@ config = {
     '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,
     #########################################################################
 }
diff --git a/testing/mozharness/configs/builds/taskcluster_firefox_win32_clang_debug.py b/testing/mozharness/configs/builds/taskcluster_firefox_win32_clang_debug.py
index bd30b7e834bc..c3ae1cb5b100 100644
--- a/testing/mozharness/configs/builds/taskcluster_firefox_win32_clang_debug.py
+++ b/testing/mozharness/configs/builds/taskcluster_firefox_win32_clang_debug.py
@@ -91,5 +91,6 @@ config = {
     '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,
     #########################################################################
 }
diff --git a/testing/mozharness/configs/builds/taskcluster_firefox_win64_clang.py b/testing/mozharness/configs/builds/taskcluster_firefox_win64_clang.py
index 803cfe072b75..b434c4548747 100644
--- a/testing/mozharness/configs/builds/taskcluster_firefox_win64_clang.py
+++ b/testing/mozharness/configs/builds/taskcluster_firefox_win64_clang.py
@@ -85,5 +85,6 @@ config = {
     '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,
     #########################################################################
 }
diff --git a/testing/mozharness/configs/builds/taskcluster_firefox_win64_clang_debug.py b/testing/mozharness/configs/builds/taskcluster_firefox_win64_clang_debug.py
index 8a36b65e7add..e1ad9a4ec830 100644
--- a/testing/mozharness/configs/builds/taskcluster_firefox_win64_clang_debug.py
+++ b/testing/mozharness/configs/builds/taskcluster_firefox_win64_clang_debug.py
@@ -87,5 +87,6 @@ config = {
     '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,
     #########################################################################
 }