Skip to content

Commit 3b081bb

Browse files
committed
Store the built template on S3 for validation and create-stack
1 parent ca7ef36 commit 3b081bb

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

.buildkite/steps/launch.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,10 @@ echo "--- Building templates"
103103
make "mappings-for-${os}-${arch}-image" build/aws-stack.yml "IMAGE_ID=$image_id"
104104

105105
echo "--- Validating templates"
106-
# 2021-11-25 KD: template larger than template-body supports, needs moving to s3
107-
# make validate
106+
make validate "BUCKET_PREFIX=$stack_name"
108107

109108
echo "--- Creating stack ${stack_name}"
110-
make create-stack "STACK_NAME=$stack_name" "SERVICE_ROLE=$service_role"
109+
make create-stack "BUCKET_PREFIX=$stack_name" "STACK_NAME=$stack_name" "SERVICE_ROLE=$service_role"
111110

112111
echo "+++ ⌛️ Waiting for update to complete"
113112
./parfait watch-stack "${stack_name}"

Makefile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,12 +143,13 @@ ifdef SERVICE_ROLE
143143
role_arn="--role-arn=$(SERVICE_ROLE)"
144144
endif
145145

146-
create-stack: build/aws-stack.yml env-STACK_NAME
146+
create-stack: build/aws-stack.yml env-STACK_NAME env-BUILDKITE_AWS_STACK_BUCKET env-BUCKET_PREFIX
147+
aws s3 cp --content-type 'text/yaml' --acl public-read build/aws-stack.yml "s3://$(BUILDKITE_AWS_STACK_BUCKET)/$(BUCKET_PREFIX)/aws-stack.yml"
147148
aws cloudformation create-stack \
148149
--output text \
149150
--stack-name $(STACK_NAME) \
150151
--disable-rollback \
151-
--template-body "file://$(PWD)/build/aws-stack.yml" \
152+
--template-url "s3://$(BUILDKITE_AWS_STACK_BUCKET)/$(BUCKET_PREFIX)/aws-stack.yml" \
152153
--capabilities CAPABILITY_IAM CAPABILITY_NAMED_IAM CAPABILITY_AUTO_EXPAND \
153154
--parameters "$$(cat config.json)" \
154155
"$(role_arn)"
@@ -175,10 +176,11 @@ bump-agent-version:
175176
git add README.md packer/linux/scripts/install-buildkite-agent.sh packer/windows/scripts/install-buildkite-agent.ps1
176177
git commit -m "Bump buildkite-agent to v$(AGENT_VERSION)"
177178

178-
validate: build/aws-stack.yml
179+
validate: build/aws-stack.yml env-BUILDKITE_AWS_STACK_BUCKET env-BUCKET_PREFIX
180+
aws s3 cp --content-type 'text/yaml' --acl public-read build/aws-stack.yml "s3://$(BUILDKITE_AWS_STACK_BUCKET)/$(BUCKET_PREFIX)/aws-stack.yml"
179181
aws cloudformation validate-template \
180182
--output text \
181-
--template-body "file://$(PWD)/build/aws-stack.yml"
183+
--template-url "s3://$(BUILDKITE_AWS_STACK_BUCKET)/$(BUCKET_PREFIX)/aws-stack.yml"
182184

183185
generate-toc:
184186
docker run -it --rm -v "$(PWD):/app" node:slim bash \

0 commit comments

Comments
 (0)