diff --git a/.kitchen.vagrant.yml b/.kitchen.vagrant.yml index d4afa3cf..0ee1c7ca 100644 --- a/.kitchen.vagrant.yml +++ b/.kitchen.vagrant.yml @@ -24,10 +24,6 @@ transport: max_ssh_sessions: 5 platforms: -- name: ubuntu-12.04 - driver_config: - box: opscode-ubuntu-12.04 - box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.04_chef-provisionerless.box - name: ubuntu-14.04 driver_config: box: opscode-ubuntu-14.04 diff --git a/.kitchen.yml b/.kitchen.yml index fb2f728c..56b9b979 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -40,10 +40,6 @@ platforms: driver: image: rndmh3ro/docker-oracle7-ansible:latest platform: centos -- name: ubuntu1204-ansible-latest - driver: - image: rndmh3ro/docker-ubuntu1204-ansible:latest - platform: ubuntu - name: ubuntu1404-ansible-latest driver: image: rndmh3ro/docker-ubuntu1404-ansible:latest diff --git a/.travis.yml b/.travis.yml index 0c1d82b0..2a0c5782 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,10 +29,6 @@ env: version: latest init: /sbin/init - - distro: ubuntu1204 - version: latest - init: /sbin/init - - distro: debian7 version: latest init: /sbin/init diff --git a/README.md b/README.md index c25ac495..80d9071e 100644 --- a/README.md +++ b/README.md @@ -110,27 +110,27 @@ bundle install ### Testing with Docker ``` # fast test on one machine -bundle exec kitchen test default-ubuntu-1204 +bundle exec kitchen test default-ubuntu-1404 # test on all machines bundle exec kitchen test # for development -bundle exec kitchen create default-ubuntu-1204 -bundle exec kitchen converge default-ubuntu-1204 +bundle exec kitchen create default-ubuntu-1404 +bundle exec kitchen converge default-ubuntu-1404 ``` ### Testing with Virtualbox ``` # fast test on one machine -KITCHEN_YAML=".kitchen.vagrant.yml" bundle exec kitchen test default-ubuntu-1204 +KITCHEN_YAML=".kitchen.vagrant.yml" bundle exec kitchen test default-ubuntu-1404 # test on all machines KITCHEN_YAML=".kitchen.vagrant.yml" bundle exec kitchen test # for development -KITCHEN_YAML=".kitchen.vagrant.yml" bundle exec kitchen create default-ubuntu-1204 -KITCHEN_YAML=".kitchen.vagrant.yml" bundle exec kitchen converge default-ubuntu-1204 +KITCHEN_YAML=".kitchen.vagrant.yml" bundle exec kitchen create default-ubuntu-1404 +KITCHEN_YAML=".kitchen.vagrant.yml" bundle exec kitchen converge default-ubuntu-1404 ``` For more information see [test-kitchen](http://kitchen.ci/docs/getting-started)