From 807c782ab79ec9ebd2a733de1822c2aa0ef67c4d Mon Sep 17 00:00:00 2001 From: Alin Selagea Date: Thu, 19 Jan 2017 18:30:21 +0200 Subject: [PATCH] Bug 1330999 - Turn off all Win10 support in Buildbot, r=kmoir --- configs/Ec2UserdataUtils.psm1 | 2 - configs/b-2008.user-data | 2 +- configs/g-w10 | 95 ----------------------- configs/g-w10.user-data | 142 ---------------------------------- configs/t-w10 | 95 ----------------------- configs/t-w10.user-data | 1 - configs/watch_pending.cfg | 38 ++------- 7 files changed, 7 insertions(+), 368 deletions(-) delete mode 100644 configs/g-w10 delete mode 100644 configs/g-w10.user-data delete mode 100644 configs/t-w10 delete mode 100644 configs/t-w10.user-data diff --git a/configs/Ec2UserdataUtils.psm1 b/configs/Ec2UserdataUtils.psm1 index c54ef242..62217217 100644 --- 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 index 7da5abef..79eb4fa2 100644 --- 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 deleted file mode 100644 index f824cf6e..00000000 --- a/configs/g-w10 +++ /dev/null @@ -1,95 +0,0 @@ -{ - "hostname": "g-w10-ec2-%03d", - "us-east-1": { - "type": "g-w10", - "domain": "test.releng.use1.mozilla.com", - "ami": "ami-94790083", - "subnet_ids": [ - "subnet-5bafe92c", - "subnet-e40e0786", - "subnet-ff3542d7", - "subnet-49981462", - "subnet-f22fb5ab", - "subnet-b8643190", - "subnet-fb97bc8f", - "subnet-5cd0d828", - "subnet-3835cc52", - "subnet-ae35ccc4", - "subnet-4f981464", - "subnet-ed35cc87", - "subnet-42f0c078", - "subnet-844b7ec2", - "subnet-8f32cbe5", - "subnet-f42fb5ad", - "subnet-a11d08c3", - "subnet-5032d235", - "subnet-7ca5f03a", - "subnet-5332d236" - ], - "security_group_ids": [ - "sg-f0f1239f" - ], - "instance_type": "g2.2xlarge", - "distro": "win7", - "ssh_key": "aws-releng", - "use_public_ip": true, - "instance_profile_name": "g-w10", - "device_map": { - "/dev/sda1": { - "delete_on_termination": true, - "skip_resize": true, - "volume_type": "gp2", - "iops": 3000, - "size": 120, - "instance_dev": "C:" - } - }, - "tags": { - "moz-type": "g-w10" - } - }, - "us-west-2": { - "type": "g-w10", - "domain": "test.releng.usw2.mozilla.com", - "ami": "ami-7d99601d", - "subnet_ids": [ - "subnet-aecba8c7", - "subnet-56082710", - "subnet-40b36d19", - "subnet-a4cba8cd", - "subnet-871471e2", - "subnet-737f9216", - "subnet-46932831", - "subnet-41932836", - "subnet-be89a2ca", - "subnet-d6cba8bf", - "subnet-851471e0", - "subnet-4f932838", - "subnet-e4464a90", - "subnet-b91471dc", - "subnet-45b36d1c", - "subnet-ec464a98" - ], - "security_group_ids": [ - "sg-8b9f7ce4" - ], - "instance_type": "g2.2xlarge", - "distro": "win7", - "ssh_key": "aws-releng", - "use_public_ip": true, - "instance_profile_name": "g-w10", - "device_map": { - "/dev/sda1": { - "delete_on_termination": true, - "skip_resize": true, - "volume_type": "gp2", - "iops": 3000, - "size": 120, - "instance_dev": "C:" - } - }, - "tags": { - "moz-type": "g-w10" - } - } -} diff --git a/configs/g-w10.user-data b/configs/g-w10.user-data deleted file mode 100644 index ce937038..00000000 --- a/configs/g-w10.user-data +++ /dev/null @@ -1,142 +0,0 @@ -<# -This Source Code Form is subject to the terms of the Mozilla Public -License, v. 2.0. If a copy of the MPL was not distributed with this -file, You can obtain one at http://mozilla.org/MPL/2.0/. -.Synopsis - Bootstrap an AWS EC2 instance with cloud-tools (https://github.com/mozilla/build-cloud-tools) -.Description - This script will do the following when run: - - log output to the puppet mailing list, to enable debugging - - check and/or correct the hostname if required - - check and/or correct the primary dns suffix - - check and/or correct the nxlog aggregator configuration - - ensure only a single puppet run on the golden instance - - handle reboots and shutdowns (eg: after hostname changes or puppet runs) -.Notes - All parameters have sensible defaults and only need to be provided when running outside of the cloud-tools environment (eg: testing). - If running outside of cloud tools, ensure that you provide sensible values for: hostname, domain & aggregator. - Double angle brackets used in this script are intentional and used to escape the bracket when python pre-processing replaces single bracket tokens. -.Parameter hostname - Defines the hostname of the target instance. - When run by cloud-tools, the hostname token will be replaced before the script is uploaded to the target instance. - Defaults to: '{{hostname}}', if not defined. -.Parameter domain - Defines the primary DNS suffix of the target instance. - When run by cloud-tools, the domain token will be replaced before the script is uploaded to the target instance. - Defaults to: '{{domain}}', if not defined. -.Parameter puppetServer - Defines the hostname of the puppet server. - When run by cloud-tools, the puppet_server token will be replaced before the script is uploaded to the target instance. - Defaults to: '{{puppet_server}}', if not defined. -.Parameter aggregator - Defines the hostname of the log aggregation server. - When run by cloud-tools, the region_dns_atom token will be replaced before the script is uploaded to the target instance. - Defaults to: 'log-aggregator.srv.releng.{{region_dns_atom}}.mozilla.com', if not defined. -.Parameter logDir - Defines the local directory on the target host where log files will be generated and kept. - The directory will be created if it does not exist. - Defaults to: 'C:\log', if not defined. -.Parameter smtpServer - Defines the smtp server that will relay log messages. - Defaults to: 'smtp.mail.scl3.mozilla.com', if not defined. -.Parameter logSender - Defines the email sender (from address) for log reports generated by this script. - Defaults to an address comprised of the username from environment variable and the hostname and domain arguments mentioned above. -.Parameter logRecipients - Defines the email recipient list for log reports generated by this script. - Accepts a string, if only one recipient, or a string array, if more than one. - Defaults to: 'releng-puppet-mail@mozilla.com', if not defined. -.Example - PS>.\userscript.ps1 -hostname b-2008-ec2-something -domain build.releng.use1.mozilla.com -aggregator log-aggregator.srv.releng.use1.mozilla.com -#> -param ( - # accept tokens from cloud-tools (change tokens to actual values if running outside cloud-tools) - [string] $hostname = '{hostname}', - [string] $domain = '{domain}', - [string] $puppetServer = '{puppet_server}', - [string] $deployPass = '{password}', - [string] $aggregator = 'log-aggregator.srv.releng.{region_dns_atom}.mozilla.com', - - # runtime configuration - [string] $logDir = ('{{0}}\log' -f $env:SystemDrive), - [string] $smtpServer = 'smtp.mail.scl3.mozilla.com', - [string] $logSender = ('{{0}}@{{1}}.{{2}}' -f $env:USERNAME, $hostname, $domain), - [string[]] $logRecipients = @('releng-puppet-mail@mozilla.com'), - - [string] $buildUsername = 'cltbld' -) -# runtime configuration -$runLog = [IO.Path]::Combine($logDir, 'userdata-run.log') -$puppetLog = [IO.Path]::Combine($logDir, 'puppet-agent-run.log') -$ec2Log = ('{{0}}\Amazon\Ec2ConfigService\Logs\Ec2ConfigLog.txt' -f $env:ProgramFiles) -$smtpServer = $smtpServer - -function Download-Module {{ - <# - .Synopsis - Downloads a psm1 module file to the local modules folder - .Description - The local module will use the psm1 filename, minus extension, as the module name - .Parameter url - The full url to the userdata module. - .Parameter modulesPath - The full path to the local modules folder. - #> - param ( - [string] $url, - [string] $modulesPath = ('{{0}}\Modules' -f $pshome) - ) - $filename = $url.Substring($url.LastIndexOf('/') + 1) - $moduleName = [IO.Path]::GetFileNameWithoutExtension($filename) - $modulePath = ('{{0}}\{{1}}' -f $modulesPath, $moduleName) - if (Test-Path $modulePath) {{ - Remove-Module $moduleName -ErrorAction SilentlyContinue - Remove-Item -path $modulePath -recurse -force - }} - New-Item -ItemType Directory -Force -Path $modulePath - (New-Object Net.WebClient).DownloadFile($url, ('{{0}}\{{1}}' -f $modulePath, $filename)) -}} - -# download and import the Ec2UserdataUtils module -Download-Module -url 'https://raw.githubusercontent.com/mozilla-releng/build-cloud-tools/master/configs/Ec2UserdataUtils.psm1' -Import-Module Ec2UserdataUtils - -# create the log directory if it doesn't exist -New-Item -ItemType Directory -Force -Path $logDir -Set-Ec2ConfigPluginsState -Set-Timezone -Disable-Firewall -Disable-WindowsUpdate -Install-BasePrerequisites -aggregator $aggregator -domain $domain -Rename-Admin -if (!(Is-DomainSetCorrectly -domainExpected $domain)) {{ - Set-Domain -domain $domain -}} -$hostRenamed = $false -if (!(Is-HostnameSetCorrectly -hostnameExpected $hostname)) {{ - Set-Hostname -hostname $hostname - $hostRenamed = $true - Stop-ComputerWithDelay -reason 'host renamed' -restart -}} -if (!$hostRenamed) {{ - if ($hostname.Contains("-golden")) {{ - 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)-2[0-9]{{3}}-ec2-[a-z].*") {{ - Prep-Loaner -deployPass $deployPass - }} -}} -if (!($hostname.Contains("-spot-"))) {{ - Send-Log -logfile $runLog -subject ('UserData Run Report for {{0}}.{{1}}' -f $hostname, $domain) -to 'releng-puppet-mail@mozilla.com' -from $logSender - Send-Log -logfile $ec2Log -subject ('EC2 Config Report for {{0}}.{{1}}' -f $hostname, $domain) -to 'releng-puppet-mail@mozilla.com' -from $logSender -}} -Move-Item -path $runLog -destination ([IO.Path]::Combine($logDir, ('userdata-run-{{0}}.log' -f [DateTime]::Now.ToString("yyyyMMdd-HHmm"))))-ErrorAction SilentlyContinue -Move-Item -path $ec2Log -destination ([IO.Path]::Combine($logDir, ('ec2config-run-{{0}}.log' -f [DateTime]::Now.ToString("yyyyMMdd-HHmm"))))-ErrorAction SilentlyContinue - -true - -# see bug 1243421 -hostname: {fqdn} -moz_instance_type: {moz_instance_type} - diff --git a/configs/t-w10 b/configs/t-w10 deleted file mode 100644 index 0a5a8ba5..00000000 --- a/configs/t-w10 +++ /dev/null @@ -1,95 +0,0 @@ -{ - "hostname": "t-w10-ec2-%03d", - "us-east-1": { - "type": "t-w10", - "domain": "test.releng.use1.mozilla.com", - "ami": "ami-cbc33fa6", - "subnet_ids": [ - "subnet-5bafe92c", - "subnet-e40e0786", - "subnet-ff3542d7", - "subnet-49981462", - "subnet-f22fb5ab", - "subnet-b8643190", - "subnet-fb97bc8f", - "subnet-5cd0d828", - "subnet-3835cc52", - "subnet-ae35ccc4", - "subnet-4f981464", - "subnet-ed35cc87", - "subnet-42f0c078", - "subnet-844b7ec2", - "subnet-8f32cbe5", - "subnet-f42fb5ad", - "subnet-a11d08c3", - "subnet-5032d235", - "subnet-7ca5f03a", - "subnet-5332d236" - ], - "security_group_ids": [ - "sg-f0f1239f" - ], - "instance_type": "g2.2xlarge", - "distro": "win10", - "ssh_key": "aws-releng", - "use_public_ip": true, - "instance_profile_name": "t-w10", - "device_map": { - "/dev/sda1": { - "delete_on_termination": true, - "skip_resize": true, - "volume_type": "gp2", - "iops": 3000, - "size": 120, - "instance_dev": "C:" - } - }, - "tags": { - "moz-type": "t-w10" - } - }, - "us-west-2": { - "type": "t-w10", - "domain": "test.releng.usw2.mozilla.com", - "ami": "ami-3139c151", - "subnet_ids": [ - "subnet-aecba8c7", - "subnet-56082710", - "subnet-40b36d19", - "subnet-a4cba8cd", - "subnet-871471e2", - "subnet-737f9216", - "subnet-46932831", - "subnet-41932836", - "subnet-be89a2ca", - "subnet-d6cba8bf", - "subnet-851471e0", - "subnet-4f932838", - "subnet-e4464a90", - "subnet-b91471dc", - "subnet-45b36d1c", - "subnet-ec464a98" - ], - "security_group_ids": [ - "sg-8b9f7ce4" - ], - "instance_type": "g2.2xlarge", - "distro": "win10", - "ssh_key": "aws-releng", - "use_public_ip": true, - "instance_profile_name": "t-w10", - "device_map": { - "/dev/sda1": { - "delete_on_termination": true, - "skip_resize": true, - "volume_type": "gp2", - "iops": 3000, - "size": 120, - "instance_dev": "C:" - } - }, - "tags": { - "moz-type": "t-w10" - } - } -} \ No newline at end of file diff --git a/configs/t-w10.user-data b/configs/t-w10.user-data deleted file mode 100644 index 14140acf..00000000 --- a/configs/t-w10.user-data +++ /dev/null @@ -1 +0,0 @@ -b-2008.user-data \ No newline at end of file diff --git a/configs/watch_pending.cfg b/configs/watch_pending.cfg index 9c023bb9..8fdf6a82 100644 --- a/configs/watch_pending.cfg +++ b/configs/watch_pending.cfg @@ -46,8 +46,6 @@ "^b2g_(emulator|ubuntu64)(-jb|-kk)?_vm(?!_large)": "tst-linux64", "^Windows 7 VM 32-bit.*": "t-w732", "^Windows 7 VM-GFX 32-bit.*": "g-w732", - "^Windows 10 VM 64-bit.*": "t-w10", - "^Windows 10 VM-GFX 64-bit.*": "g-w10", "^Android 2.3( Armv6)? Emulator(?:(?!plain-reftest|crashtest|jsreftest).)*$": "tst-linux64", "^Android 2.3( Armv6)? Emulator.*(?:plain-reftest|crashtest|jsreftest)": "tst-emulator64", "^Android armv7 API 9.*test (?:(?!plain-reftest|crashtest|jsreftest).)*$": "tst-linux64", @@ -85,18 +83,6 @@ "performance_constant": 1, "bid_price": 0.53} ], - "t-w10": [ - {"instance_type": "c3.2xlarge", - "ignored_azs": ["us-east-1b", "us-east-1e"], - "performance_constant": 1, - "bid_price": 0.53} - ], - "g-w10": [ - {"instance_type": "g2.2xlarge", - "ignored_azs": ["us-east-1b", "us-east-1e"], - "performance_constant": 1, - "bid_price": 0.79} - ], "g-w732": [ {"instance_type": "g2.2xlarge", "ignored_azs": ["us-east-1b", "us-east-1e"], @@ -250,9 +236,7 @@ "b-2008": 200, "y-2008": 200, "t-w732": 1000, - "g-w732": 1000, - "t-w10": 1000, - "g-w10": 0 + "g-w732": 1000 }, "us-east-1": { "tst-linux64": 1450, @@ -264,9 +248,7 @@ "b-2008": 100, "y-2008": 100, "t-w732": 500, - "g-w732": 500, - "t-w10": 500, - "g-w10": 500 + "g-w732": 500 }, "us-west-2": { "tst-linux64": 1450, @@ -278,9 +260,7 @@ "b-2008": 100, "y-2008": 100, "t-w732": 500, - "g-w732": 500, - "t-w10": 500, - "g-w10": 500 + "g-w732": 500 } } }, @@ -296,9 +276,7 @@ "b-2008": 0, "y-2008": 0, "t-w732": 0, - "g-w732": 0, - "t-w10": 0, - "g-w10": 0 + "g-w732": 0 }, "us-east-1": { "tst-linux64": 0, @@ -310,9 +288,7 @@ "b-2008": 0, "y-2008": 0, "t-w732": 0, - "g-w732": 0, - "t-w10": 0, - "g-w10": 0 + "g-w732": 0 }, "us-west-2": { "tst-linux64": 0, @@ -324,9 +300,7 @@ "b-2008": 0, "y-2008": 0, "t-w732": 0, - "g-w732": 0, - "t-w10": 0, - "g-w10": 0 + "g-w732": 0 } } },