We commented out the awesome_customers tests from Travis while master is on fire, but they are still in the berksfile which was pulling down an older version of the selinux cookbook.

Signed-off-by: Noah Kantrowitz <noah@coderanger.net>

2 files changed, 10 insertions, 67 deletions

diff --git a/kitchen-tests/Berksfile b/kitchen-tests/Berksfile
index 09e4cea33a..9a2df463fc 100644
--- a/kitchen-tests/Berksfile
+++ b/kitchen-tests/Berksfile
@@ -7,7 +7,8 @@ cookbook "php", "~> 1.5.0"
 
 cookbook "resolver", github: "chef-cookbooks/resolver"
 
-cookbook "awesome_customers_ubuntu_wrapper", path: "cookbooks/awesome_customers_ubuntu_wrapper"
-cookbook "awesome_customers_ubuntu", github: "lamont-granquist/awesome_customers_ubuntu", branch: "lcg/bump-mysql-version"
-cookbook "awesome_customers_rhel_wrapper", path: "cookbooks/awesome_customers_rhel_wrapper"
-cookbook "awesome_customers_rhel", github: "lamont-granquist/awesome_customers_rhel", branch: "lcg/bump-mysql-version"
+# Disabled pending updating these test cases for Chef 13.
+# cookbook "awesome_customers_ubuntu_wrapper", path: "cookbooks/awesome_customers_ubuntu_wrapper"
+# cookbook "awesome_customers_ubuntu", github: "lamont-granquist/awesome_customers_ubuntu", branch: "lcg/bump-mysql-version"
+# cookbook "awesome_customers_rhel_wrapper", path: "cookbooks/awesome_customers_rhel_wrapper"
+# cookbook "awesome_customers_rhel", github: "lamont-granquist/awesome_customers_rhel", branch: "lcg/bump-mysql-version"
diff --git a/kitchen-tests/Berksfile.lock b/kitchen-tests/Berksfile.lock
index 620c23e5ba..caf64a342b 100644
--- a/kitchen-tests/Berksfile.lock
+++ b/kitchen-tests/Berksfile.lock
@@ -1,16 +1,4 @@
 DEPENDENCIES
-  awesome_customers_rhel
-    git: https://github.com/lamont-granquist/awesome_customers_rhel.git
-    revision: ed730957b1b75c8701c708e2deb0740ca8325322
-    branch: lcg/bump-mysql-version
-  awesome_customers_rhel_wrapper
-    path: cookbooks/awesome_customers_rhel_wrapper
-  awesome_customers_ubuntu
-    git: https://github.com/lamont-granquist/awesome_customers_ubuntu.git
-    revision: 9d40958413d0ed1ef1e68c74d41895158c724964
-    branch: lcg/bump-mysql-version
-  awesome_customers_ubuntu_wrapper
-    path: cookbooks/awesome_customers_ubuntu_wrapper
   base
     path: cookbooks/base
   php (~> 1.5.0)
@@ -19,26 +7,7 @@ DEPENDENCIES
     revision: 4ab8cb0dfee3696fb8a1e4398e95bff9f33fd6ab
 
 GRAPH
-  apt (4.0.2)
-    compat_resource (>= 12.10)
-  awesome_customers_rhel (0.1.0)
-    database (~> 6.0)
-    firewall (~> 2.5)
-    httpd (~> 0.4)
-    mysql (~> 8.0)
-    mysql2_chef_gem (~> 1.1)
-    selinux (~> 0.9)
-  awesome_customers_rhel_wrapper (0.1.0)
-    awesome_customers_rhel (>= 0.0.0)
-  awesome_customers_ubuntu (0.1.0)
-    apt (~> 4.0)
-    database (~> 6.0)
-    firewall (~> 2.5)
-    httpd (~> 0.4)
-    mysql (~> 8.0)
-    mysql2_chef_gem (~> 1.1)
-  awesome_customers_ubuntu_wrapper (0.1.0)
-    awesome_customers_ubuntu (>= 0.0.0)
+  apt (6.0.1)
   base (0.1.0)
     apt (>= 0.0.0)
     build-essential (>= 0.0.0)
@@ -57,48 +26,29 @@ GRAPH
   build-essential (8.0.0)
     mingw (>= 1.1)
     seven_zip (>= 0.0.0)
-  chef-client (7.2.0)
+  chef-client (7.2.1)
     cron (>= 1.7.0)
     logrotate (>= 1.9.0)
     windows (>= 1.42.0)
-  chef-sugar (3.4.0)
   chef_hostname (0.5.0)
   compat_resource (12.16.3)
   cron (4.1.0)
     compat_resource (>= 0.0.0)
-  database (6.1.1)
-    postgresql (>= 1.0.0)
-  firewall (2.5.4)
-    chef-sugar (>= 0.0.0)
-  httpd (0.4.5)
-    compat_resource (>= 12.16.3)
   iis (5.1.0)
     windows (>= 2.0)
-  inifile_chef_gem (0.1.0)
-    build-essential (>= 0.0.0)
-  iptables (4.0.0)
+  iptables (4.0.1)
   logrotate (2.1.0)
     compat_resource (>= 0.0.0)
-  mariadb (1.3.0)
-    apt (>= 0.0.0)
-    yum (>= 0.0.0)
-    yum-epel (>= 0.0.0)
-    yum-scl (>= 0.0.0)
   mingw (2.0.0)
     seven_zip (>= 0.0.0)
   multipackage (4.0.0)
     compat_resource (>= 0.0.0)
   mysql (8.3.0)
-  mysql2_chef_gem (1.1.0)
-    build-essential (>= 0.0.0)
-    mariadb (>= 0.0.0)
-    mysql (>= 6.0)
   nscd (5.0.0)
   ntp (3.3.1)
   ohai (5.0.2)
   openssh (2.1.1)
     iptables (>= 1.0)
-  openssl (7.0.1)
   php (1.5.0)
     build-essential (>= 0.0.0)
     iis (>= 0.0.0)
@@ -106,25 +56,17 @@ GRAPH
     windows (>= 0.0.0)
     xml (>= 0.0.0)
     yum-epel (>= 0.0.0)
-  postgresql (6.1.1)
-    build-essential (>= 2.0.0)
-    compat_resource (>= 12.16.3)
-    openssl (>= 4.0)
   resolver (2.0.1)
-  selinux (0.9.0)
+  selinux (1.0.3)
   seven_zip (2.0.2)
     windows (>= 1.2.2)
   sudo (3.3.1)
   ubuntu (2.0.1)
     apt (>= 0.0.0)
   users (4.0.3)
-  windows (3.0.3)
+  windows (3.0.4)
     ohai (>= 4.0.0)
   xml (3.1.1)
     build-essential (>= 0.0.0)
-  yum (5.0.0)
   yum-epel (2.1.1)
     compat_resource (>= 12.16.3)
-  yum-scl (0.2.0)
-    inifile_chef_gem (>= 0.0.0)
-    yum (>= 0.0.0)