Merge pull request #6025 from chef/integration_test_tweaks

Remove Ubuntu 12.04 testing in Travis + integration tweaks

15 files changed, 24 insertions, 42 deletions

diff --git a/.travis.yml b/.travis.yml
index aea79db190..85881f6f18 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -115,24 +115,6 @@ matrix:
       - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
       - cd kitchen-tests
     script:
-      - bundle exec kitchen test webapp-ubuntu-1204
-    after_failure:
-      - cat .kitchen/logs/kitchen.log
-    env:
-      - UBUNTU=12.04
-      - KITCHEN_YAML=.kitchen.travis.yml
-  - rvm: 2.4.1
-    services: docker
-    sudo: required
-    gemfile: kitchen-tests/Gemfile
-    before_install:
-      - gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
-      - gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
-    bundler_args: --without ci development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
-    before_script:
-      - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
-      - cd kitchen-tests
-    script:
       - bundle exec kitchen test webapp-ubuntu-1404
     after_failure:
       - cat .kitchen/logs/kitchen.log
@@ -188,7 +170,6 @@ matrix:
       - cd kitchen-tests
     script:
       - bundle exec kitchen test webapp-debian-8
-    bundler_args: --without ci development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
     after_failure:
       - cat .kitchen/logs/kitchen.log
     env:
diff --git a/kitchen-tests/.kitchen.travis.yml b/kitchen-tests/.kitchen.travis.yml
index 6a66daffe6..3dcc5c64a7 100644
--- a/kitchen-tests/.kitchen.travis.yml
+++ b/kitchen-tests/.kitchen.travis.yml
@@ -83,14 +83,6 @@ platforms:
       - RUN yum makecache
       - RUN sed -i -e "s/Defaults.*requiretty.*/Defaults    !requiretty/g" /etc/sudoers
 
-- name: ubuntu-12.04
-  driver:
-    image: ubuntu-upstart:12.04
-    pid_one_command: /sbin/init
-    intermediate_instructions:
-      - RUN /usr/bin/apt-get update
-      - RUN /usr/bin/apt-get -y install zlib1g-dev sudo net-tools wget ca-certificates
-
 - name: ubuntu-14.04
   driver:
     image: ubuntu-upstart:14.04
diff --git a/kitchen-tests/.kitchen.yml b/kitchen-tests/.kitchen.yml
index 33841b0b94..87981781db 100644
--- a/kitchen-tests/.kitchen.yml
+++ b/kitchen-tests/.kitchen.yml
@@ -22,7 +22,6 @@ provisioner:
     diff_disabled: true
 
 platforms:
-  - name: ubuntu-12.04
   - name: ubuntu-14.04
   - name: ubuntu-16.04
   - name: centos-7.2
diff --git a/kitchen-tests/cookbooks/audit_test/metadata.rb b/kitchen-tests/cookbooks/audit_test/metadata.rb
index 3fbda5dbe1..2b34ce28d0 100644
--- a/kitchen-tests/cookbooks/audit_test/metadata.rb
+++ b/kitchen-tests/cookbooks/audit_test/metadata.rb
@@ -1,7 +1,7 @@
 name             "audit_test"
 maintainer       "The Authors"
 maintainer_email "you@example.com"
-license          "all_rights"
+license          "Apache-2.0"
 description      "Installs/Configures audit_test"
 long_description "Installs/Configures audit_test"
 version          "0.1.0"
diff --git a/kitchen-tests/cookbooks/awesome_customers_rhel_wrapper/metadata.rb b/kitchen-tests/cookbooks/awesome_customers_rhel_wrapper/metadata.rb
index 641f2f91e3..49dbb50869 100644
--- a/kitchen-tests/cookbooks/awesome_customers_rhel_wrapper/metadata.rb
+++ b/kitchen-tests/cookbooks/awesome_customers_rhel_wrapper/metadata.rb
@@ -1,7 +1,7 @@
 name "awesome_customers_rhel_wrapper"
 maintainer "The Authors"
 maintainer_email "you@example.com"
-license "all_rights"
+license "Apache-2.0"
 description "Installs/Configures awesome_customers_rhel"
 long_description "Installs/Configures awesome_customers_rhel"
 version "0.1.0"
diff --git a/kitchen-tests/cookbooks/awesome_customers_rhel_wrapper/recipes/default.rb b/kitchen-tests/cookbooks/awesome_customers_rhel_wrapper/recipes/default.rb
index 058ee61617..c58db5fe29 100644
--- a/kitchen-tests/cookbooks/awesome_customers_rhel_wrapper/recipes/default.rb
+++ b/kitchen-tests/cookbooks/awesome_customers_rhel_wrapper/recipes/default.rb
@@ -1,6 +1,8 @@
 #
-# Cookbook Name:: awesome_customers_rhel
+# Cookbook:: awesome_customers_rhel
 # Recipe:: default
 #
-# Copyright (c) 2016 The Authors, All Rights Reserved.
+# Copyright:: 2014-2017, Chef Software, Inc.
+#
+
 include_recipe "awesome_customers_rhel::default"
diff --git a/kitchen-tests/cookbooks/awesome_customers_ubuntu_wrapper/metadata.rb b/kitchen-tests/cookbooks/awesome_customers_ubuntu_wrapper/metadata.rb
index 429fce2f64..d07a2c2c13 100644
--- a/kitchen-tests/cookbooks/awesome_customers_ubuntu_wrapper/metadata.rb
+++ b/kitchen-tests/cookbooks/awesome_customers_ubuntu_wrapper/metadata.rb
@@ -1,7 +1,7 @@
 name "awesome_customers_ubuntu_wrapper"
 maintainer "The Authors"
 maintainer_email "you@example.com"
-license "all_rights"
+license "Apache-2.0"
 description "Installs/Configures awesome_customers_ubuntu"
 long_description "Installs/Configures awesome_customers_ubuntu"
 version "0.1.0"
diff --git a/kitchen-tests/cookbooks/awesome_customers_ubuntu_wrapper/recipes/default.rb b/kitchen-tests/cookbooks/awesome_customers_ubuntu_wrapper/recipes/default.rb
index 93012d295f..f6fd388f16 100644
--- a/kitchen-tests/cookbooks/awesome_customers_ubuntu_wrapper/recipes/default.rb
+++ b/kitchen-tests/cookbooks/awesome_customers_ubuntu_wrapper/recipes/default.rb
@@ -1,6 +1,8 @@
 #
-# Cookbook Name:: awesome_customers_ubuntu
+# Cookbook:: awesome_customers_ubuntu
 # Recipe:: default
 #
-# Copyright (c) 2016 The Authors, All Rights Reserved.
+# Copyright:: 2016-2017, Chef Software, Inc.
+#
+
 include_recipe "awesome_customers_ubuntu::default"
diff --git a/kitchen-tests/cookbooks/base/metadata.rb b/kitchen-tests/cookbooks/base/metadata.rb
index 32ea03916f..d29665d598 100644
--- a/kitchen-tests/cookbooks/base/metadata.rb
+++ b/kitchen-tests/cookbooks/base/metadata.rb
@@ -1,7 +1,7 @@
 name             "base"
 maintainer       ""
 maintainer_email ""
-license          ""
+license          "Apache-2.0"
 description      "Installs/Configures base"
 long_description "Installs/Configures base"
 version          "0.1.0"
diff --git a/kitchen-tests/cookbooks/base/recipes/default.rb b/kitchen-tests/cookbooks/base/recipes/default.rb
index c25673bef5..d8dbb9fe41 100644
--- a/kitchen-tests/cookbooks/base/recipes/default.rb
+++ b/kitchen-tests/cookbooks/base/recipes/default.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: webapp
+# Cookbook:: webapp
 # Recipe:: default
 #
-# Copyright (C) 2014
+# Copyright:: 2014-2017, Chef Software, Inc.
 #
 
 hostname "chef-travis-ci.chef.io"
diff --git a/kitchen-tests/cookbooks/base/recipes/packages.rb b/kitchen-tests/cookbooks/base/recipes/packages.rb
index c4457e5945..bb5fa7bb71 100644
--- a/kitchen-tests/cookbooks/base/recipes/packages.rb
+++ b/kitchen-tests/cookbooks/base/recipes/packages.rb
@@ -1,3 +1,9 @@
+#
+# Cookbook:: webapp
+# Recipe:: packages
+#
+# Copyright:: 2014-2017, Chef Software, Inc.
+#
 
 # this is just a list of package that exist on every O/S we test, and often aren't installed by default.  you don't
 # have to get too clever here, you can delete packages if they don't exist everywhere we test.
diff --git a/kitchen-tests/cookbooks/base/recipes/tests.rb b/kitchen-tests/cookbooks/base/recipes/tests.rb
index 9d9d813865..8b90b48c5d 100644
--- a/kitchen-tests/cookbooks/base/recipes/tests.rb
+++ b/kitchen-tests/cookbooks/base/recipes/tests.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: webapp
-# Recipe:: default
+# Cookbook:: webapp
+# Recipe:: tests
 #
-# Copyright (C) 2014
+# Copyright:: 2014-2017, Chef Software, Inc.
 #
 
 #
diff --git a/kitchen-tests/cookbooks/webapp/metadata.rb b/kitchen-tests/cookbooks/webapp/metadata.rb
index 5124aa4f6f..f560159fd8 100644
--- a/kitchen-tests/cookbooks/webapp/metadata.rb
+++ b/kitchen-tests/cookbooks/webapp/metadata.rb
@@ -1,7 +1,7 @@
 name             "webapp"
 maintainer       ""
 maintainer_email ""
-license          ""
+license          "Apache-2.0"
 description      "Installs/Configures webapp"
 long_description "Installs/Configures webapp"
 version          "0.1.0"
diff --git a/kitchen-tests/cookbooks/webapp/templates/default/index.html.erb b/kitchen-tests/cookbooks/webapp/templates/index.html.erb
index 6da0629b9e..6da0629b9e 100644
--- a/kitchen-tests/cookbooks/webapp/templates/default/index.html.erb
+++ b/kitchen-tests/cookbooks/webapp/templates/index.html.erb
diff --git a/kitchen-tests/cookbooks/webapp/templates/default/index.php.erb b/kitchen-tests/cookbooks/webapp/templates/index.php.erb
index b08b076614..b08b076614 100644
--- a/kitchen-tests/cookbooks/webapp/templates/default/index.php.erb
+++ b/kitchen-tests/cookbooks/webapp/templates/index.php.erb