Skip to content

Cleanup base AMI build logic #1597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
scadu merged 7 commits into from
Sep 26, 2025
Merged

Cleanup base AMI build logic #1597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2209bb6
Cleanup base AMI build logic
scadu Sep 22, 2025
80f932a
Fix build
scadu Sep 22, 2025
5bf0ef5
Fix SSH
scadu Sep 22, 2025
de929ab
Fix Windows base AMI build
scadu Sep 22, 2025
6d791a9
Consolidate shared resources between base and stack AMIs
scadu Sep 22, 2025
2079e2a
Align CloudWatch agent config with Windows
scadu Sep 23, 2025
e22b40e
Merge branch 'main' into cleanup_if_changed_SUP-4787
petetomasik Sep 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .buildkite/pipeline.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ steps:
AMI_PUBLIC: true
agents:
queue: "${BUILDKITE_AGENT_META_DATA_QUEUE}"
if_changed: "packer/windows/base/**"
depends_on:
- "linting"
- "fixperms-tests"
Expand Down Expand Up @@ -138,6 +139,7 @@ steps:
AMI_PUBLIC: true
agents:
queue: "${BUILDKITE_AGENT_META_DATA_QUEUE}"
if_changed: "packer/linux/base/**"
depends_on:
- "linting"
- "fixperms-tests"
Expand Down Expand Up @@ -211,6 +213,7 @@ steps:
AMI_PUBLIC: true
agents:
queue: "${BUILDKITE_AGENT_META_DATA_QUEUE}"
if_changed: "packer/linux/base/**"
depends_on:
- "linting"
- "fixperms-tests"
Expand Down
11 changes: 0 additions & 11 deletions .buildkite/scripts/trigger-base-rebuild.sh
View file
Open in desktop

This file was deleted.

17 changes: 4 additions & 13 deletions .buildkite/steps/packer.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,7 @@ fi

os="${1:-linux}"
arch="${2:-amd64}"
variant="${3:-full}" # "full" (default) or "base"
agent_binary="buildkite-agent-${os}-${arch}"

if [[ "$os" == "windows" ]]; then
agent_binary+=".exe"
fi
variant="${3:-stack}" # "stack" (default) or "base"

mkdir -p "build/"

Expand All @@ -22,15 +17,9 @@ timestamp=$(date -u +"%Y%m%d-%H%M%S")
if [[ "${variant}" == "base" ]]; then
packer_file="packer-base-${os}-${arch}-${timestamp}.output"
local_output="packer-base-${os}-${arch}.output"
else
packer_file="packer-${os}-${arch}-${timestamp}.output"
local_output="packer-${os}-${arch}.output"
fi

if [[ "${variant}" == "base" ]]; then
make "packer-base-${os}-${arch}.output"
else
# Try metadata first, then S3 fallback for base AMI ID
# Get base AMI ID from metadata (set by base build step) or S3 fallback
base_ami_id="$(buildkite-agent meta-data get "${os}-base-${arch}-ami" || true)"

if [[ -z "$base_ami_id" ]]; then
Expand All @@ -50,6 +39,8 @@ else
exit 1
fi

packer_file="packer-${os}-${arch}-${timestamp}.output"
local_output="packer-${os}-${arch}.output"
make "packer-${os}-${arch}.output" BASE_AMI_ID="$base_ami_id"
fi

Expand Down
34 changes: 18 additions & 16 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ VERSION = $(shell git describe --tags --candidates=1)
SHELL = /bin/bash -o pipefail

PACKER_VERSION ?= 1.11.2
PACKER_LINUX_FILES = $(exec find packer/linux)
PACKER_WINDOWS_FILES = $(exec find packer/windows)
PACKER_LINUX_BASE_FILES = $(exec find packer/linux/base)
PACKER_LINUX_STACK_FILES = $(exec find packer/linux/stack)
PACKER_WINDOWS_BASE_FILES = $(exec find packer/windows/base)
PACKER_WINDOWS_STACK_FILES = $(exec find packer/windows/stack)

# Allow passing an existing golden base AMI into packer via `BASE_AMI_ID` env var
override BASE_AMI_ID ?=
Expand Down Expand Up @@ -105,7 +107,7 @@ build/linux-amd64-ami.txt: packer-linux-amd64.output env-AWS_REGION
grep -Eo "$(AWS_REGION): (ami-.+)" $< | cut -d' ' -f2 | xargs echo -n > $@

# Build linux packer image
packer-linux-amd64.output: $(PACKER_LINUX_FILES) build/fix-perms-linux-amd64
packer-linux-amd64.output: $(PACKER_LINUX_STACK_FILES) build/fix-perms-linux-amd64
docker run \
-e AWS_DEFAULT_REGION \
-e AWS_PROFILE \
Expand All @@ -116,7 +118,7 @@ packer-linux-amd64.output: $(PACKER_LINUX_FILES) build/fix-perms-linux-amd64
-v ${HOME}/.aws:/root/.aws \
-v "$(PWD):/src" \
--rm \
-w /src/packer/linux \
-w /src/packer/linux/stack \
hashicorp/packer:full-$(PACKER_VERSION) build -timestamp-ui \
-var 'region=$(AWS_REGION)' \
-var 'arch=x86_64' \
Expand All @@ -133,15 +135,15 @@ build/linux-arm64-ami.txt: packer-linux-arm64.output env-AWS_REGION
grep -Eo "$(AWS_REGION): (ami-.+)" $< | cut -d' ' -f2 | xargs echo -n > $@

# NOTE: make removes the $ escapes, everything else is passed to the shell
CURRENT_AGENT_VERSION_LINUX ?= $(shell $(SED) -En 's/^AGENT_VERSION="?(.+?)"?$$/\1/p' packer/linux/scripts/install-buildkite-agent.sh)
CURRENT_AGENT_VERSION_WINDOWS ?= $(shell $(SED) -En 's/^\$$AGENT_VERSION = "(.+?)"$$/\1/p' packer/windows/scripts/install-buildkite-agent.ps1)
CURRENT_AGENT_VERSION_LINUX ?= $(shell $(SED) -En 's/^AGENT_VERSION="?(.+?)"?$$/\1/p' packer/linux/stack/scripts/install-buildkite-agent.sh)
CURRENT_AGENT_VERSION_WINDOWS ?= $(shell $(SED) -En 's/^\$$AGENT_VERSION = "(.+?)"$$/\1/p' packer/windows/stack/scripts/install-buildkite-agent.ps1)

print-agent-versions:
@echo Linux: $(CURRENT_AGENT_VERSION_LINUX)
@echo Windows: $(CURRENT_AGENT_VERSION_WINDOWS)

# Build linuxarm64 packer image
packer-linux-arm64.output: $(PACKER_LINUX_FILES) build/fix-perms-linux-arm64
packer-linux-arm64.output: $(PACKER_LINUX_STACK_FILES) build/fix-perms-linux-arm64
@echo Agent Version: $(CURRENT_AGENT_VERSION_LINUX)
docker run \
-e AWS_DEFAULT_REGION \
Expand All @@ -153,7 +155,7 @@ packer-linux-arm64.output: $(PACKER_LINUX_FILES) build/fix-perms-linux-arm64
-v ${HOME}/.aws:/root/.aws \
-v "$(PWD):/src" \
--rm \
-w /src/packer/linux \
-w /src/packer/linux/stack \
hashicorp/packer:full-$(PACKER_VERSION) build -timestamp-ui \
-var 'region=$(AWS_REGION)' \
-var 'arch=arm64' \
Expand All @@ -171,7 +173,7 @@ build/windows-amd64-ami.txt: packer-windows-amd64.output env-AWS_REGION
grep -Eo "$(AWS_REGION): (ami-.+)" $< | cut -d' ' -f2 | xargs echo -n > $@

# Build windows packer image
packer-windows-amd64.output: $(PACKER_WINDOWS_FILES)
packer-windows-amd64.output: $(PACKER_WINDOWS_STACK_FILES)
@echo Agent Version: $(CURRENT_AGENT_VERSION_WINDOWS)
docker run \
-e AWS_DEFAULT_REGION \
Expand All @@ -183,7 +185,7 @@ packer-windows-amd64.output: $(PACKER_WINDOWS_FILES)
-v ${HOME}/.aws:/root/.aws \
-v "$(PWD):/src" \
--rm \
-w /src/packer/windows \
-w /src/packer/windows/stack \
hashicorp/packer:full-$(PACKER_VERSION) build -timestamp-ui \
-var 'region=$(AWS_REGION)' \
-var 'arch=x86_64' \
Expand All @@ -200,7 +202,7 @@ packer-windows-amd64.output: $(PACKER_WINDOWS_FILES)
# Base AMI creation

# Build base AMI for linux amd64
packer-base-linux-amd64.output: $(PACKER_LINUX_FILES)
packer-base-linux-amd64.output: $(PACKER_LINUX_BASE_FILES)
docker run \
-e AWS_DEFAULT_REGION \
-e AWS_PROFILE \
Expand All @@ -211,7 +213,7 @@ packer-base-linux-amd64.output: $(PACKER_LINUX_FILES)
-v ${HOME}/.aws:/root/.aws \
-v "$(PWD):/src" \
--rm \
-w /src/packer/linux \
-w /src/packer/linux/base \
hashicorp/packer:full-$(PACKER_VERSION) build -timestamp-ui \
-var 'region=$(AWS_REGION)' \
-var 'arch=x86_64' \
Expand All @@ -221,7 +223,7 @@ packer-base-linux-amd64.output: $(PACKER_LINUX_FILES)
base.pkr.hcl | tee $@

# Build base AMI for linux arm64
packer-base-linux-arm64.output: $(PACKER_LINUX_FILES)
packer-base-linux-arm64.output: $(PACKER_LINUX_BASE_FILES)
docker run \
-e AWS_DEFAULT_REGION \
-e AWS_PROFILE \
Expand All @@ -232,7 +234,7 @@ packer-base-linux-arm64.output: $(PACKER_LINUX_FILES)
-v ${HOME}/.aws:/root/.aws \
-v "$(PWD):/src" \
--rm \
-w /src/packer/linux \
-w /src/packer/linux/base \
hashicorp/packer:full-$(PACKER_VERSION) build -timestamp-ui \
-var 'region=$(AWS_REGION)' \
-var 'arch=arm64' \
Expand All @@ -242,7 +244,7 @@ packer-base-linux-arm64.output: $(PACKER_LINUX_FILES)
base.pkr.hcl | tee $@

# Build base AMI for windows amd64
packer-base-windows-amd64.output: $(PACKER_WINDOWS_FILES)
packer-base-windows-amd64.output: $(PACKER_WINDOWS_BASE_FILES)
docker run \
-e AWS_DEFAULT_REGION \
-e AWS_PROFILE \
Expand All @@ -253,7 +255,7 @@ packer-base-windows-amd64.output: $(PACKER_WINDOWS_FILES)
-v ${HOME}/.aws:/root/.aws \
-v "$(PWD):/src" \
--rm \
-w /src/packer/windows \
-w /src/packer/windows/base \
hashicorp/packer:full-$(PACKER_VERSION) build -timestamp-ui \
-var 'region=$(AWS_REGION)' \
-var 'arch=x86_64' \
Expand Down
1 change: 0 additions & 1 deletion packer/linux/.trigger-base-build
View file
Open in desktop

This file was deleted.

6 changes: 5 additions & 1 deletion packer/linux/base.pkr.hcl → packer/linux/base/base.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,10 @@ build {
source = "conf"
}

provisioner "file" {
destination = "/tmp/conf"
source = "../shared/conf/"
}

# Essential utilities & updates
provisioner "shell" {
Expand All @@ -109,6 +113,6 @@ build {

# Clean up
provisioner "shell" {
script = "scripts/cleanup.sh"
script = "../shared/scripts/cleanup.sh"
}
}
0 packer/linux/conf/bin/docker-compose → packer/linux/base/conf/bin/docker-compose
View file
Open in desktop
File renamed without changes.
0 packer/linux/conf/docker/daemon.json → packer/linux/base/conf/docker/daemon.json
View file
Open in desktop
File renamed without changes.
0 packer/linux/conf/docker/scripts/docker-gc → .../linux/base/conf/docker/scripts/docker-gc
View file
Open in desktop
File renamed without changes.
0 ...ux/conf/docker/scripts/docker-low-disk-gc → ...se/conf/docker/scripts/docker-low-disk-gc
View file
Open in desktop
File renamed without changes.
0 ...conf/docker/systemd/docker-binfmt.service → ...conf/docker/systemd/docker-binfmt.service
View file
Open in desktop
File renamed without changes.
0 ...nux/conf/docker/systemd/docker-gc.service → ...ase/conf/docker/systemd/docker-gc.service
View file
Open in desktop
File renamed without changes.
0 ...linux/conf/docker/systemd/docker-gc.timer → .../base/conf/docker/systemd/docker-gc.timer
View file
Open in desktop
File renamed without changes.
0 ...docker/systemd/docker-low-disk-gc.service → ...docker/systemd/docker-low-disk-gc.service
View file
Open in desktop
File renamed without changes.
0 ...f/docker/systemd/docker-low-disk-gc.timer → ...f/docker/systemd/docker-low-disk-gc.timer
View file
Open in desktop
File renamed without changes.
0 ...h/systemd/refresh_authorized_keys.service → ...h/systemd/refresh_authorized_keys.service
View file
Open in desktop
File renamed without changes.
0 ...ssh/systemd/refresh_authorized_keys.timer → ...ssh/systemd/refresh_authorized_keys.timer
View file
Open in desktop
File renamed without changes.
7 changes: 7 additions & 0 deletions packer/linux/base/scripts/install-cloudwatch-agent.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/usr/bin/env bash
set -euo pipefail

echo "Installing cloudwatch agent..."
sudo dnf install -yq amazon-cloudwatch-agent

echo "CloudWatch agent installed. Configuration will be done in stack layer."
0 packer/linux/scripts/install-docker.sh → packer/linux/base/scripts/install-docker.sh
View file
Open in desktop
File renamed without changes.
0 ...scripts/install-session-manager-plugin.sh → ...scripts/install-session-manager-plugin.sh
View file
Open in desktop
File renamed without changes.
3 changes: 3 additions & 0 deletions packer/linux/scripts/install-utils.sh → packer/linux/base/scripts/install-utils.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,3 +80,6 @@ sudo curl -L "https://github.com/goss-org/goss/releases/download/${GOSS_VERSION}
sudo chmod +rx /usr/local/bin/goss
sudo curl -L "https://github.com/goss-org/goss/releases/download/${GOSS_VERSION}/dgoss" -o /usr/local/bin/dgoss
sudo chmod +rx /usr/local/bin/dgoss

echo "Adding authorized keys systemd units..."
sudo cp /tmp/conf/ssh/systemd/* /etc/systemd/system
0 packer/linux/conf/aws/config → packer/linux/shared/conf/aws/config
View file
Open in desktop
File renamed without changes.
0 packer/linux/scripts/cleanup.sh → packer/linux/shared/scripts/cleanup.sh
View file
Open in desktop
File renamed without changes.
15 changes: 12 additions & 3 deletions packer/linux/buildkite-ami.pkr.hcl → packer/linux/stack/buildkite-ami.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,17 +114,26 @@ build {
source = "conf"
}

provisioner "file" {
destination = "/tmp/conf"
source = "../shared/conf/"
}

provisioner "file" {
destination = "/tmp/plugins"
source = "../../plugins"
source = "../../../plugins"
}

provisioner "file" {
destination = "/tmp/build"
source = "../../build"
source = "../../../build"
}


provisioner "shell" {
script = "scripts/configure-cloudwatch-agent.sh"
}

provisioner "shell" {
script = "scripts/install-buildkite-agent.sh"
}
Expand All @@ -134,6 +143,6 @@ build {
}

provisioner "shell" {
script = "scripts/cleanup.sh"
script = "../shared/scripts/cleanup.sh"
}
}
0 packer/linux/conf/bin/bk-check-disk-space.sh → ...nux/stack/conf/bin/bk-check-disk-space.sh
View file
Open in desktop
File renamed without changes.
0 packer/linux/conf/bin/bk-configure-docker.sh → ...nux/stack/conf/bin/bk-configure-docker.sh
View file
Open in desktop
File renamed without changes.
0 packer/linux/conf/bin/bk-fetch.sh → packer/linux/stack/conf/bin/bk-fetch.sh
View file
Open in desktop
File renamed without changes.
0 ...inux/conf/bin/bk-install-elastic-stack.sh → ...tack/conf/bin/bk-install-elastic-stack.sh
View file
Open in desktop
File renamed without changes.
0 ...nux/conf/bin/bk-mount-instance-storage.sh → ...ack/conf/bin/bk-mount-instance-storage.sh
View file
Open in desktop
File renamed without changes.
0 ...ux/conf/buildkite-agent/hooks/environment → ...ck/conf/buildkite-agent/hooks/environment
View file
Open in desktop
File renamed without changes.
0 ...ux/conf/buildkite-agent/hooks/pre-command → ...ck/conf/buildkite-agent/hooks/pre-command
View file
Open in desktop
File renamed without changes.
0 ...linux/conf/buildkite-agent/hooks/pre-exit → ...stack/conf/buildkite-agent/hooks/pre-exit
View file
Open in desktop
File renamed without changes.
0 ...dkite-agent/scripts/stop-agent-gracefully → ...dkite-agent/scripts/stop-agent-gracefully
View file
Open in desktop
File renamed without changes.
0 ...uildkite-agent/scripts/terminate-instance → ...uildkite-agent/scripts/terminate-instance
View file
Open in desktop
File renamed without changes.
0 ...r/linux/conf/buildkite-agent/sudoers.conf → ...x/stack/conf/buildkite-agent/sudoers.conf
View file
Open in desktop
File renamed without changes.
0 ...ite-agent/systemd/buildkite-agent.service → ...ite-agent/systemd/buildkite-agent.service
View file
Open in desktop
File renamed without changes.
0 ...al.service.d/10-power-off-on-failure.conf → ...al.service.d/10-power-off-on-failure.conf
View file
Open in desktop
File renamed without changes.
0 ...r/linux/conf/cloudwatch-agent/config.json → ...dwatch-agent/amazon-cloudwatch-agent.json
View file
Open in desktop
File renamed without changes.
0 ...atch-agent/rsyslog.d/buildkite-agent.conf → ...atch-agent/rsyslog.d/buildkite-agent.conf
View file
Open in desktop
File renamed without changes.
0 ...nf/cloudwatch-agent/rsyslog.d/docker.conf → ...nf/cloudwatch-agent/rsyslog.d/docker.conf
View file
Open in desktop
File renamed without changes.
5 changes: 2 additions & 3 deletions ...linux/scripts/install-cloudwatch-agent.sh → ...ack/scripts/configure-cloudwatch-agent.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
#!/usr/bin/env bash
set -euo pipefail

echo "Installing cloudwatch agent..."
sudo dnf install -yq amazon-cloudwatch-agent
echo "Configuring cloudwatch agent..."

echo "Adding amazon-cloudwatch-agent config..."
sudo cp /tmp/conf/cloudwatch-agent/config.json /opt/aws/amazon-cloudwatch-agent/etc/amazon-cloudwatch-agent.json
sudo cp /tmp/conf/cloudwatch-agent/amazon-cloudwatch-agent.json /opt/aws/amazon-cloudwatch-agent/etc/amazon-cloudwatch-agent.json

echo "Configuring amazon-cloudwatch-agent to start at boot"
sudo systemctl enable amazon-cloudwatch-agent
Expand Down
0 .../linux/scripts/install-buildkite-agent.sh → .../stack/scripts/install-buildkite-agent.sh
View file
Open in desktop
File renamed without changes.
3 changes: 0 additions & 3 deletions .../linux/scripts/install-buildkite-utils.sh → .../stack/scripts/install-buildkite-utils.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,3 @@ sudo curl -Lf -o /usr/bin/lifecycled \
sudo chmod +x /usr/bin/lifecycled
sudo curl -Lf -o /etc/systemd/system/lifecycled.service \
https://raw.githubusercontent.com/buildkite/lifecycled/${LIFECYCLED_VERSION}/init/systemd/lifecycled.unit

echo "Adding authorized keys systemd units..."
sudo cp /tmp/conf/ssh/systemd/* /etc/systemd/system
1 change: 0 additions & 1 deletion packer/windows/.trigger-base-build
View file
Open in desktop

This file was deleted.

7 changes: 1 addition & 6 deletions packer/windows/base.pkr.hcl → packer/windows/base/base.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ source "amazon-ebs" "buildkite-base" {
instance_type = var.instance_type
region = var.region
source_ami = data.amazon-ami.windows-server-2022.id
user_data_file = "scripts/ec2-userdata.ps1"
user_data_file = "../shared/scripts/ec2-userdata.ps1"
winrm_insecure = true
winrm_use_ssl = true
winrm_port = 5986
Expand All @@ -78,11 +78,6 @@ source "amazon-ebs" "buildkite-base" {
build {
sources = ["source.amazon-ebs.buildkite-base"]

provisioner "file" {
destination = "C:/packer-temp"
source = "conf"
}

provisioner "file" {
destination = "C:/packer-temp"
source = "scripts"
Expand Down
0 packer/windows/scripts/enable-containers.ps1 → ...indows/base/scripts/enable-containers.ps1
View file
Open in desktop
File renamed without changes.
15 changes: 15 additions & 0 deletions packer/windows/base/scripts/install-cloudwatch-agent.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Stop script execution when a non-terminating error occurs
$ErrorActionPreference = "Stop"

Write-Output "Downloading amazon cloudwatch agent..."
Invoke-WebRequest -OutFile C:\packer-temp\amazon-cloudwatch-agent.msi -Uri "https://s3.amazonaws.com/amazoncloudwatch-agent/windows/amd64/latest/amazon-cloudwatch-agent.msi"

Write-Output "Installing amazon cloudwatch agent..."
$process = Start-Process msiexec -ArgumentList "/i", "C:\packer-temp\amazon-cloudwatch-agent.msi", "/quiet", "/norestart" -Wait -PassThru
If ($process.ExitCode -ne 0) { Exit $process.ExitCode }

Write-Output "Setting amazon cloudwatch agent start type to manual (will be configured in stack layer)..."
sc.exe config AmazonCloudWatchAgent start= demand
If ($lastexitcode -ne 0) { Exit $lastexitcode }

Write-Output "CloudWatch agent installed. Configuration will be done in stack layer."
0 packer/windows/scripts/install-docker.ps1 → ...r/windows/base/scripts/install-docker.ps1
View file
Open in desktop
File renamed without changes.
0 ...er/windows/scripts/install-lifecycled.ps1 → ...ndows/base/scripts/install-lifecycled.ps1
View file
Open in desktop
File renamed without changes.
0 ...cripts/install-session-manager-plugin.ps1 → ...cripts/install-session-manager-plugin.ps1
View file
Open in desktop
File renamed without changes.
0 packer/windows/scripts/install-utils.ps1 → ...er/windows/base/scripts/install-utils.ps1
View file
Open in desktop
File renamed without changes.
18 changes: 0 additions & 18 deletions packer/windows/scripts/install-cloudwatch-agent.ps1
View file
Open in desktop

This file was deleted.

0 packer/windows/scripts/ec2-userdata.ps1 → ...r/windows/shared/scripts/ec2-userdata.ps1
View file
Open in desktop
File renamed without changes.
5 changes: 3 additions & 2 deletions packer/windows/buildkite-ami.pkr.hcl → packer/windows/stack/buildkite-ami.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ source "amazon-ebs" "elastic-ci-stack" {
region = var.region
# Allow golden-base override
source_ami = var.base_ami_id
user_data_file = "scripts/ec2-userdata.ps1"
user_data_file = "../shared/scripts/ec2-userdata.ps1"
winrm_insecure = true
winrm_use_ssl = true
winrm_port = 5986
Expand Down Expand Up @@ -115,11 +115,12 @@ build {

provisioner "file" {
destination = "C:/packer-temp"
source = "../../plugins"
source = "../../../plugins"
}

provisioner "powershell" {
scripts = [
"scripts/configure-cloudwatch-agent.ps1",
"scripts/install-buildkite-agent.ps1",
"scripts/install-s3secrets-helper.ps1"
]
Expand Down
0 .../windows/conf/bin/bk-configure-docker.ps1 → ...ws/stack/conf/bin/bk-configure-docker.ps1
View file
Open in desktop
File renamed without changes.
0 packer/windows/conf/bin/bk-fetch.ps1 → packer/windows/stack/conf/bin/bk-fetch.ps1
View file
Open in desktop
File renamed without changes.
0 ...ows/conf/bin/bk-install-elastic-stack.ps1 → ...ack/conf/bin/bk-install-elastic-stack.ps1
View file
Open in desktop
File renamed without changes.
0 ...ws/conf/buildkite-agent/hooks/environment → ...ck/conf/buildkite-agent/hooks/environment
View file
Open in desktop
File renamed without changes.
0 ...ws/conf/buildkite-agent/hooks/pre-command → ...ck/conf/buildkite-agent/hooks/pre-command
View file
Open in desktop
File renamed without changes.
0 ...ndows/conf/buildkite-agent/hooks/pre-exit → ...stack/conf/buildkite-agent/hooks/pre-exit
View file
Open in desktop
File renamed without changes.
0 ...e-agent/scripts/stop-agent-gracefully.ps1 → ...e-agent/scripts/stop-agent-gracefully.ps1
View file
Open in desktop
File renamed without changes.
0 ...kite-agent/scripts/terminate-instance.ps1 → ...kite-agent/scripts/terminate-instance.ps1
View file
Open in desktop
File renamed without changes.
0 ...dwatch-agent/amazon-cloudwatch-agent.json → ...dwatch-agent/amazon-cloudwatch-agent.json
View file
Open in desktop
File renamed without changes.
10 changes: 10 additions & 0 deletions packer/windows/stack/scripts/configure-cloudwatch-agent.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Stop script execution when a non-terminating error occurs
$ErrorActionPreference = "Stop"

Write-Output "Configuring CloudWatch agent..."

Write-Output "Copying amazon cloudwatch agent config..."
Copy-Item -Path C:\packer-temp\conf\cloudwatch-agent\amazon-cloudwatch-agent.json -Destination C:\ProgramData\Amazon\AmazonCloudWatchAgent

Write-Output "Starting amazon cloudwatch agent..."
& 'C:\Program Files\Amazon\AmazonCloudWatchAgent\amazon-cloudwatch-agent-ctl.ps1' -a fetch-config -m ec2 -c file:C:\ProgramData\Amazon\AmazonCloudWatchAgent\amazon-cloudwatch-agent.json -s
0 ...ndows/scripts/install-buildkite-agent.ps1 → ...stack/scripts/install-buildkite-agent.ps1
View file
Open in desktop
File renamed without changes.
0 ...dows/scripts/install-s3secrets-helper.ps1 → ...tack/scripts/install-s3secrets-helper.ps1
View file
Open in desktop
File renamed without changes.