Merge pull request #746 from buildkite/chloeruka/windows-quickfix

Configure Windows service exit like the unix service

Author: James Healy

packer/windows/conf/bin/bk-install-elastic-stack.ps1

@@ -168,7 +168,9 @@ nssm set buildkite-agent AppStderr C:\buildkite-agent\buildkite-agent.log
 If ($lastexitcode -ne 0) { Exit $lastexitcode }
 nssm set buildkite-agent AppEnvironmentExtra :HOME=C:\buildkite-agent
 If ($lastexitcode -ne 0) { Exit $lastexitcode }
-nssm set buildkite-agent AppExit Default Exit
+nssm set buildkite-agent AppExit Default Restart
+If ($lastexitcode -ne 0) { Exit $lastexitcode }
+nssm set buildkite-agent AppRestartDelay 10000
 If ($lastexitcode -ne 0) { Exit $lastexitcode }
 nssm set buildkite-agent AppEvents Exit/Post "powershell C:\buildkite-agent\bin\terminate-instance.ps1"
 If ($lastexitcode -ne 0) { Exit $lastexitcode }

packer/windows/conf/buildkite-agent/scripts/terminate-instance.ps1

@@ -1,9 +1,13 @@
-# Stop script execution when a non-terminating error occurs
-$ErrorActionPreference = "Stop"
-
 $InstanceId = (Invoke-WebRequest -UseBasicParsing http://169.254.169.254/latest/meta-data/instance-id).content
 $Region = (Invoke-WebRequest -UseBasicParsing http://169.254.169.254/latest/meta-data/placement/availability-zone).content -replace ".$"
 
-aws autoscaling terminate-instance-in-auto-scaling-group --region "$Region" --instance-id "$InstanceId" "--should-decrement-desired-capacity"
+Write-Output "terminate-instance: requesting instance termination..."
+aws autoscaling terminate-instance-in-auto-scaling-group --region "$Region" --instance-id "$InstanceId" "--should-decrement-desired-capacity" 2> $null
 
-Stop-Computer $env:computername -Force
+if ($lastexitcode -eq 0) { # If autoscaling request was successful, we will terminate
+  Write-Output "terminate-instance: disabling buildkite-agent service"
+  nssm stop buildkite-agent
+}
+else {
+  Write-Output "terminate-instance: ASG could not decrement (we're already at minSize)"
+}