diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2015-06-04 08:55:28 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2015-06-04 08:55:28 -0700 |
| commit | 511754c110192a4c365b0596b530b8a3da375aef (patch) | |
| tree | 77614dcb6ea64a3e7b66ca8191fea2e3a4b2d941 | |
| parent | c69db828a15451a91196385876cb215a01141394 (diff) | |
| parent | 734e26173eb5a5e31c5b3ff693b628ae5903a35d (diff) | |
| download | chef-511754c110192a4c365b0596b530b8a3da375aef.tar.gz | |
Merge pull request #3488 from chef/lcg/hvm-ssd-ami
switch to an HVM ssd based AMI
| -rw-r--r-- | kitchen-tests/.kitchen.travis.yml | 3 | ||||
| -rw-r--r-- | kitchen-tests/Gemfile | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/kitchen-tests/.kitchen.travis.yml b/kitchen-tests/.kitchen.travis.yml index 06abed513c..2c3de60108 100644 --- a/kitchen-tests/.kitchen.travis.yml +++ b/kitchen-tests/.kitchen.travis.yml @@ -27,7 +27,8 @@ platforms: - name: ubuntu-12.04 driver: # http://cloud-images.ubuntu.com/locator/ec2/ - image_id: ami-c15379f1 + # 12.04 amd64 us-west-2 hvm:ssd + image_id: ami-f3635fc3 - name: rhel-6 driver: # https://github.com/chef/releng-chef-repo/blob/master/script/ci#L93-L96 diff --git a/kitchen-tests/Gemfile b/kitchen-tests/Gemfile index 7690a8c462..db06f392ab 100644 --- a/kitchen-tests/Gemfile +++ b/kitchen-tests/Gemfile @@ -5,5 +5,5 @@ group :end_to_end do gem 'test-kitchen', '~> 1.4.0' gem 'kitchen-appbundle-updater', '~> 0.0.1' gem "kitchen-vagrant", '~> 0.17.0' - gem 'kitchen-ec2', :github => 'test-kitchen/kitchen-ec2' + gem 'kitchen-ec2', github: 'test-kitchen/kitchen-ec2', tag: 'v0.9.3' end |