File tree Expand file tree Collapse file tree 2 files changed +8
-7
lines changed Expand file tree Collapse file tree 2 files changed +8
-7
lines changed Original file line number Diff line number Diff line change @@ -103,11 +103,10 @@ echo "--- Building templates"
103
103
make " mappings-for-${os} -${arch} -image" build/aws-stack.yml " IMAGE_ID=$image_id "
104
104
105
105
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 "
108
107
109
108
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 "
111
110
112
111
echo " +++ ⌛️ Waiting for update to complete"
113
112
./parfait watch-stack " ${stack_name} "
Original file line number Diff line number Diff line change @@ -143,12 +143,13 @@ ifdef SERVICE_ROLE
143
143
role_arn="--role-arn=$(SERVICE_ROLE)"
144
144
endif
145
145
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"
147
148
aws cloudformation create-stack \
148
149
--output text \
149
150
--stack-name $(STACK_NAME ) \
150
151
--disable-rollback \
151
- --template-body " file ://$( PWD ) /build /aws-stack.yml" \
152
+ --template-url " s3 ://$( BUILDKITE_AWS_STACK_BUCKET ) / $( BUCKET_PREFIX ) /aws-stack.yml" \
152
153
--capabilities CAPABILITY_IAM CAPABILITY_NAMED_IAM CAPABILITY_AUTO_EXPAND \
153
154
--parameters " $$ (cat config.json)" \
154
155
" $( role_arn) "
@@ -175,10 +176,11 @@ bump-agent-version:
175
176
git add README.md packer/linux/scripts/install-buildkite-agent.sh packer/windows/scripts/install-buildkite-agent.ps1
176
177
git commit -m " Bump buildkite-agent to v$( AGENT_VERSION) "
177
178
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"
179
181
aws cloudformation validate-template \
180
182
--output text \
181
- --template-body " file ://$( PWD ) /build /aws-stack.yml"
183
+ --template-url " s3 ://$( BUILDKITE_AWS_STACK_BUCKET ) / $( BUCKET_PREFIX ) /aws-stack.yml"
182
184
183
185
generate-toc :
184
186
docker run -it --rm -v " $( PWD) :/app" node:slim bash \
You can’t perform that action at this time.
0 commit comments