Merge pull request #103 from buildkite/kill-all-agents-then-wait

Send all the kills before waiting

packer/conf/buildkite-agent/scripts/buildkite-agent-lifecycled-handler

@@ -9,12 +9,12 @@ echo "Stopping buildkite-agent gracefully"
 
 for i in $(seq 1 "${BUILDKITE_AGENTS_PER_INSTANCE}"); do
   service "buildkite-agent-${i}" stop &
+done
 
-  # Need to ensure it's the buildkite-agent user, so it doesn't match this lifecycld handler script
-  while pgrep -u buildkite-agent buildkite-agent > /dev/null; do
-    echo "Waiting for service buildkite-agent-${i} to have stopped..."
-    sleep 5
-  done
+# Need to ensure it's the buildkite-agent user, so it doesn't match this lifecycld handler script
+while pgrep -u buildkite-agent buildkite-agent > /dev/null; do
+  echo "Waiting for all buildkite-agent processes to have stopped..."
+  sleep 5
 done
 
-echo "buildkite-agent stopped"
+echo "All buildkite-agent processes have stopped"