Skip to content

Commit 486db91

Browse files
authored
Merge pull request #908 from buildkite/keithduncan/remove-lifecycled
Remove lifecycled
2 parents 2192f6d + ddf6595 commit 486db91

File tree

8 files changed

+0
-74
lines changed

8 files changed

+0
-74
lines changed

goss.yaml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,6 @@ service:
4444
enabled: true
4545
running: true
4646

47-
lifecycled:
48-
enabled: true
49-
running: true
50-
5147
sshd:
5248
enabled: true
5349
running: true
@@ -93,9 +89,6 @@ process:
9389
buildkite-agent:
9490
running: true
9591

96-
lifecycled:
97-
running: true
98-
9992
sshd:
10093
running: true
10194

packer/linux/buildkite-ami.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,6 @@
4545
"type": "shell",
4646
"script": "scripts/install-cloudwatch-agent.sh"
4747
},
48-
{
49-
"type": "shell",
50-
"script": "scripts/install-lifecycled.sh"
51-
},
5248
{
5349
"type": "shell",
5450
"script": "scripts/install-docker.sh"

packer/linux/conf/bin/bk-install-elastic-stack.sh

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -176,15 +176,6 @@ if [[ -n "${BUILDKITE_ELASTIC_BOOTSTRAP_SCRIPT}" ]] ; then
176176
rm /tmp/elastic_bootstrap
177177
fi
178178

179-
cat << EOF > /etc/lifecycled
180-
AWS_REGION=${AWS_REGION}
181-
LIFECYCLED_HANDLER=/usr/local/bin/stop-agent-gracefully
182-
LIFECYCLED_CLOUDWATCH_GROUP=/buildkite/lifecycled
183-
EOF
184-
185-
systemctl enable lifecycled.service
186-
systemctl start lifecycled
187-
188179
# wait for docker to start
189180
next_wait_time=0
190181
until docker ps || [ $next_wait_time -eq 5 ]; do

packer/linux/scripts/install-lifecycled.sh

Lines changed: 0 additions & 22 deletions
This file was deleted.

packer/windows/buildkite-ami.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,6 @@
4444
"type": "powershell",
4545
"script": "scripts/install-cloudwatch-agent.ps1"
4646
},
47-
{
48-
"type": "powershell",
49-
"script": "scripts/install-lifecycled.ps1"
50-
},
5147
{
5248
"type": "powershell",
5349
"script": "scripts/install-docker.ps1"

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,6 @@ disconnect-after-job=${Env:BUILDKITE_TERMINATE_INSTANCE_AFTER_JOB}
139139
"@
140140
$OFS=" "
141141

142-
nssm set lifecycled AppEnvironmentExtra :AWS_REGION=$Env:AWS_REGION
143-
nssm set lifecycled AppEnvironmentExtra +LIFECYCLED_HANDLER="C:\buildkite-agent\bin\stop-agent-gracefully.ps1"
144-
Restart-Service lifecycled
145-
146142
# wait for docker to start
147143
$next_wait_time=0
148144
do {

packer/windows/conf/cloudwatch-agent/amazon-cloudwatch-agent.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@
2222
"file_path": "C:\\buildkite-agent\\buildkite-agent.log",
2323
"log_group_name": "/buildkite/buildkite-agent",
2424
"timestamp_format": "%Y-%m-%dT%H:%M:%S.%f"
25-
},
26-
{
27-
"file_path": "C:\\lifecycled\\lifecycled.log",
28-
"log_group_name": "/buildkite/lifecycled",
29-
"timestamp_format": "%Y-%m-%dT%H:%M:%S.%f"
3025
}
3126
]
3227
},

packer/windows/scripts/install-lifecycled.ps1

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)