Merge pull request #889 from buildkite/keithduncan/release/5.5.1

Release v5.5.1

Author: keithduncan

CHANGELOG.md

@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [v5.5.1](https://github.com/buildkite/elastic-ci-stack-for-aws/compare/v5.5.0...v5.5.1) (2021-08-06)
+
+### Changed
+
+* Included buildkite-agent from 3.32.0 to 3.32.1
+
+### Fixed
+
+* A source of unexpected instance termination causing build failures [#888](https://github.com/buildkite/elastic-ci-stack-for-aws/pull/888)
+
 ## [v5.5.0](https://github.com/buildkite/elastic-ci-stack-for-aws/compare/v5.4.0...v5.5.0) (2021-07-30)
 
 ### Added

packer/linux/conf/buildkite-agent/hooks/environment

@@ -96,7 +96,7 @@ if [[ "${DOCKER_USERNS_REMAP:-false}" == "false" ]] ; then
   #   BUILDKITE_BUILD_PATH="/var/lib/buildkite-agent/builds"
 
   # So we can calculate the suffix as a substring:
-  AGENT_ORG_PIPELINE_DIR="${BUILDKITE_BUILD_CHECKOUT_PATH#${BUILDKITE_BUILD_PATH}/}"
+  AGENT_ORG_PIPELINE_DIR="${BUILDKITE_BUILD_CHECKOUT_PATH#"${BUILDKITE_BUILD_PATH}/"}"
   # => "my-agent-1/my-org/my-pipeline"
 
   # Then we can grab just the first path component, the agent name, by removing
@@ -105,7 +105,7 @@ if [[ "${DOCKER_USERNS_REMAP:-false}" == "false" ]] ; then
   # => "my-agent-1"
 
   # Then we can figure out the org/pipeline path component
-  ORG_PIPELINE_DIR="${AGENT_ORG_PIPELINE_DIR#${AGENT_DIR}/}"
+  ORG_PIPELINE_DIR="${AGENT_ORG_PIPELINE_DIR#"${AGENT_DIR}/"}"
   # => "my-org/my-pipeline"
 
   # Then we grab just the first path component, the org, by removing the longest
@@ -114,7 +114,7 @@ if [[ "${DOCKER_USERNS_REMAP:-false}" == "false" ]] ; then
   # => "my-org"
 
   # Then we can figure out the pipeline path component using the org dir
-  PIPELINE_DIR="${ORG_PIPELINE_DIR#${ORG_DIR}/}"
+  PIPELINE_DIR="${ORG_PIPELINE_DIR#"${ORG_DIR}/"}"
   # => "my-pipeline"
 
   # Now we can pass this to the sudo script which will validate it before safely chmodding:

packer/linux/scripts/install-buildkite-agent.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -eu -o pipefail
 
-AGENT_VERSION=3.32.0
+AGENT_VERSION=3.32.1
 
 MACHINE="$(uname -m)"
 

packer/windows/scripts/install-buildkite-agent.ps1

@@ -1,7 +1,7 @@
 # Stop script execution when a non-terminating error occurs
 $ErrorActionPreference = "Stop"
 
-$AGENT_VERSION = "3.32.0"
+$AGENT_VERSION = "3.32.1"
 
 Write-Output "Creating bin dir..."
 New-Item -ItemType directory -Path C:\buildkite-agent\bin

templates/aws-stack.yml

@@ -1018,7 +1018,7 @@ Resources:
             - !Ref "AWS::NoValue"
       MinSize: !Ref MinSize
       MaxSize: !Ref MaxSize
-      Cooldown: 0
+      Cooldown: 60
       MetricsCollection:
         - Granularity: 1Minute
           Metrics: