Skip to content

Commit

Permalink
[acceptance] double royale with cheese instance
Browse files Browse the repository at this point in the history
The build times take way too long on an m3.medium, and we run out of
disk space fast. Let's embiggen this to a metric instance.

Also write the output from make to a file in the repo dir because
we're losing output from mixlib/shellout for some reason.
  • Loading branch information
jtimberman committed Feb 2, 2016
1 parent 486dcc2 commit 6d97f47
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
11 changes: 9 additions & 2 deletions .delivery/cookbooks/bldr/recipes/functional.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,16 @@

ssh_key = data_bag_item('delivery-secrets', 'chef-bldr-acceptance')['github']

execute 'make clean package functional force=true' do
makelog = ::File.join(Chef::Config[:file_cache_path],
'make-functional.out')

# warn level because we use doc formatter and this won't be displayed
# otherwise :)
Chef::Log.warn("`make` will log output to #{makelog}")

execute "make clean package functional force=true 2>&1 | tee #{makelog}" do
cwd node['delivery']['workspace']['repo']
# set a two hour time out because this makes the world
# set a two hour time out because this compiles :allthethings:
timeout 7200
environment(
'GITHUB_DEPLOY_KEY' => ssh_key,
Expand Down
2 changes: 1 addition & 1 deletion .delivery/cookbooks/bldr/recipes/provision.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
docker-machine create -d amazonec2 \
--amazonec2-vpc-id vpc-2229ff47 \
--amazonec2-region us-west-2 \
--amazonec2-instance-type m3.medium \
--amazonec2-instance-type c3.xlarge \
--amazonec2-private-address-only \
bldr-docker-machine
EOH
Expand Down
2 changes: 0 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ NO_CACHE := false

all: package



package: image
ifeq ($(GITHUB_DEPLOY_KEY),)
$(run) package sh -c '(cd /src/plans && make bldr-deps)'
Expand Down

1 comment on commit 6d97f47

@chef-delivery
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Delivery Status:

Verify Build Acceptance
Unit Unit Provision
Lint Lint Deploy
Syntax Syntax Smoke
Quality Functional
Security
Publish

Please sign in to comment.