Reenable learnchef acceptance testsjk/reenable-learnchef

6 files changed, 27 insertions, 13 deletions

diff --git a/acceptance/.shared/kitchen_acceptance/.kitchen.ec2.yml b/acceptance/.shared/kitchen_acceptance/.kitchen.ec2.yml
index e4b2211c8b..36c72f1579 100644
--- a/acceptance/.shared/kitchen_acceptance/.kitchen.ec2.yml
+++ b/acceptance/.shared/kitchen_acceptance/.kitchen.ec2.yml
@@ -32,6 +32,9 @@ provisioner:
   channel: <%= ENV["KITCHEN_CHEF_CHANNEL"] %>
   client_rb:
     audit_mode: :enabled
+  attributes:
+    chef_acceptance: "true"
+    use_system_chef: "true"
 
 platforms:
   #
diff --git a/acceptance/.shared/kitchen_acceptance/.kitchen.vagrant.yml b/acceptance/.shared/kitchen_acceptance/.kitchen.vagrant.yml
index 2cdb74a475..4cd6b35d69 100644
--- a/acceptance/.shared/kitchen_acceptance/.kitchen.vagrant.yml
+++ b/acceptance/.shared/kitchen_acceptance/.kitchen.vagrant.yml
@@ -12,6 +12,9 @@ provisioner:
   channel: <%= ENV["KITCHEN_CHEF_CHANNEL"] %>
   client_rb:
     audit_mode: :enabled
+  attributes:
+     chef_acceptance: "true"
+     use_system_chef: "true"
 
 platforms:
 <% %w(
diff --git a/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/top_cookbooks.rb b/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/top_cookbooks.rb
index 5989bd060a..aed81f073b 100644
--- a/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/top_cookbooks.rb
+++ b/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/top_cookbooks.rb
@@ -7,15 +7,14 @@ class TopCookbooks < Chef::Resource
     cookbook_kitchen "#{command} git" do
     end
 
-    # https://github.com/learn-chef/learn-chef-acceptance/pull/10
-    # cookbook_kitchen "#{command} learn-the-basics-ubuntu" do
-    #   repository "learn-chef/learn-chef-acceptance"
-    #   cookbook_relative_dir "cookbooks/learn-the-basics-ubuntu"
-    # end
-    #
-    # cookbook_kitchen "#{command} learn-the-basics-windows" do
-    #   repository "learn-chef/learn-chef-acceptance"
-    #   cookbook_relative_dir "cookbooks/learn-the-basics-windows"
-    # end
+    cookbook_kitchen "#{command} learn-the-basics-ubuntu" do
+      repository "learn-chef/learn-chef-acceptance"
+      cookbook_relative_dir "cookbooks/learn-the-basics-ubuntu"
+    end
+
+    cookbook_kitchen "#{command} learn-the-basics-windows" do
+      repository "learn-chef/learn-chef-acceptance"
+      cookbook_relative_dir "cookbooks/learn-the-basics-windows"
+    end
   end
 end
diff --git a/acceptance/top-cookbooks/.kitchen.learn-the-basics-rhel.yml b/acceptance/top-cookbooks/.kitchen.learn-the-basics-rhel.yml
index 6b8848efae..6cbf1b50fa 100644
--- a/acceptance/top-cookbooks/.kitchen.learn-the-basics-rhel.yml
+++ b/acceptance/top-cookbooks/.kitchen.learn-the-basics-rhel.yml
@@ -1,4 +1,7 @@
 suites:
   - name: learn-the-basics-rhel-default
-    run_list: ["recipe[learn-the-basics-rhel::default]"]
+    run_list:
+      - recipe[learn-the-basics-rhel::setup]
+      - recipe[learn-the-basics-rhel::lesson1]
+      - recipe[learn-the-basics-rhel::lesson2]
     includes: [el-6]
diff --git a/acceptance/top-cookbooks/.kitchen.learn-the-basics-ubuntu.yml b/acceptance/top-cookbooks/.kitchen.learn-the-basics-ubuntu.yml
index b0a3e45aa3..8d54ff94cb 100644
--- a/acceptance/top-cookbooks/.kitchen.learn-the-basics-ubuntu.yml
+++ b/acceptance/top-cookbooks/.kitchen.learn-the-basics-ubuntu.yml
@@ -1,4 +1,7 @@
 suites:
   - name: learn-the-basics-ubuntu-default
-    run_list: ["recipe[learn-the-basics-ubuntu::default]"]
+    run_list:
+      - recipe[learn-the-basics-ubuntu::setup]
+      - recipe[learn-the-basics-ubuntu::lesson1]
+      - recipe[learn-the-basics-ubuntu::lesson2]
     includes: [ubuntu-14.04]
diff --git a/acceptance/top-cookbooks/.kitchen.learn-the-basics-windows.yml b/acceptance/top-cookbooks/.kitchen.learn-the-basics-windows.yml
index 4e229877ed..2704577537 100644
--- a/acceptance/top-cookbooks/.kitchen.learn-the-basics-windows.yml
+++ b/acceptance/top-cookbooks/.kitchen.learn-the-basics-windows.yml
@@ -1,4 +1,7 @@
 suites:
   - name: learn-the-basics-windows-default
-    run_list: ["recipe[learn-the-basics-windows::default]"]
+    run_list:
+      - recipe[learn-the-basics-windows::setup]
+      - recipe[learn-the-basics-windows::lesson1]
+      - recipe[learn-the-basics-windows::lesson2]
     includes: [windows-2012r2]