diff options
| author | Jay Mundrawala <jdmundrawala@gmail.com> | 2016-02-26 13:27:22 -0800 |
|---|---|---|
| committer | Jay Mundrawala <jdmundrawala@gmail.com> | 2016-02-26 13:27:22 -0800 |
| commit | 7f59d1bd2043ea183fd3287c291edb7376303340 (patch) | |
| tree | 4f09a027e2797528e91c8cbf400489182b2e52fe /acceptance | |
| parent | 2831c6206ce22e1b7bd0f736b124248f6e774166 (diff) | |
| download | chef-7f59d1bd2043ea183fd3287c291edb7376303340.tar.gz | |
Use the bento centos box for vagrantjdm/fips-acceptance
We need to use kitchen-vagrant in github so that kitchen-vagrant
does not use a bento url to download the box and instead just
goes through atlas.
Diffstat (limited to 'acceptance')
| -rw-r--r-- | acceptance/.shared/kitchen_acceptance/.kitchen.vagrant.yml | 3 | ||||
| -rw-r--r-- | acceptance/Gemfile | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/acceptance/.shared/kitchen_acceptance/.kitchen.vagrant.yml b/acceptance/.shared/kitchen_acceptance/.kitchen.vagrant.yml index 54d05980a5..1d6c7fc037 100644 --- a/acceptance/.shared/kitchen_acceptance/.kitchen.vagrant.yml +++ b/acceptance/.shared/kitchen_acceptance/.kitchen.vagrant.yml @@ -40,8 +40,7 @@ fedora-21 # centos-7 - name: centos-6 driver: - box: opscode-centos-6.6 - box_url: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.6_chef-provisionerless.box + box: bento/centos-6.7 <% %w( 2012r2 2012 diff --git a/acceptance/Gemfile b/acceptance/Gemfile index 326d769a3d..4573bc5fb3 100644 --- a/acceptance/Gemfile +++ b/acceptance/Gemfile @@ -6,7 +6,9 @@ gem "test-kitchen", github: "sersut/test-kitchen", branch: "sersut/mixlib-instal gem "kitchen-ec2", github: "test-kitchen/kitchen-ec2", branch: "jk/image-search-only" gem "kitchen-inspec" gem "inspec" -gem "kitchen-vagrant" +# Pinning to github for kitchen-vagrant because 0.19.0 incorrectly +# puts in a box_url for bento when a vagrant box in atlas is specified +gem "kitchen-vagrant", github: "test-kitchen/kitchen-vagrant" gem "windows_chef_zero" gem "winrm-transport" gem "berkshelf" |