Merge pull request #278 from AlinSelagea/bug_1330999_turn_off_win10_bb

Bug 1330999 - Turn off all Win10 support in Buildbot, r=kmoir
mozilla-releng · Jan 25, 2017 · 63e2b25 · 63e2b25
2 parents 641683f + 807c782
commit 63e2b25
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 368 deletions.
diff --git a/configs/Ec2UserdataUtils.psm1 b/configs/Ec2UserdataUtils.psm1
@@ -1773,8 +1773,6 @@ function Set-Timezone {
 function Get-EventlogOsTemplate {
   if ($env:ComputerName.Contains('-w732-')) {
     return 'nxlog_source_eventlog_win7_ec2.conf'
-  } elseif ($env:ComputerName.Contains('-w10-')) {
-    return 'nxlog_source_eventlog_win10_ec2.conf'
   } else {
     return 'nxlog_source_eventlog_win2008_ec2.conf'
   }

diff --git a/configs/b-2008.user-data b/configs/b-2008.user-data
@@ -123,7 +123,7 @@ if (!$hostRenamed) {{
     Prep-Golden -puppetServer $puppetServer -logdest $puppetLog -deployPass $deployPass -hostname $hostname -domain $domain
     Flush-EventLog
     Stop-ComputerWithDelay -reason 'userdata golden run complete'
-  }} elseif ($hostname -match "((b|y)-2008|(t|g)-w(732|10))-ec2-[a-z].*") {{
+  }} elseif ($hostname -match "((b|y)-2008|(t|g)-w732-ec2-[a-z].*") {{
     Prep-Loaner -deployPass $deployPass
   }}
 }}

diff --git a/configs/g-w10 b/configs/g-w10
diff --git a/configs/g-w10.user-data b/configs/g-w10.user-data
diff --git a/configs/t-w10 b/configs/t-w10
diff --git a/configs/t-w10.user-data b/configs/t-w10.user-data