Update testing suite to use policyfiles.

tionebsalocin · Jul 10, 2016 · 197a810 · 197a810
1 parent 68bc28a
commit 197a810
Show file tree

Hide file tree

Showing 18 changed files with 531 additions and 48 deletions.
diff --git a/.gitignore b/.gitignore
@@ -53,3 +53,4 @@ vendor
 .vagrant
 Berksfile.lock
 coverage/
+*.lock.json
diff --git a/.kitchen.yml b/.kitchen.yml
@@ -6,38 +6,31 @@ provisioner:
   name: chef_zero
 
 platforms:
+  - name: ubuntu-16.04
+    named_run_list: debian
   - name: ubuntu-14.04
-    run_list:
-      - recipe[apt::default]
+    named_run_list: debian
   - name: ubuntu-12.04
-    run_list:
-      - recipe[apt::default]
-  - name: debian-8.2
-    run_list:
-      - recipe[apt::default]
-  - name: debian-7.9
-    run_list:
-      - recipe[apt::default]
+    named_run_list: debian
   - name: centos-7.2
-    run_list:
-      - recipe[yum::default]
+    named_run_list: rhel
   - name: centos-6.7
-    run_list:
-      - recipe[yum::default]
+    named_run_list: rhel
   - name: centos-5.11
-    run_list:
-      - recipe[yum::default]
+    named_run_list: rhel
+  - name: debian-8.2
+    named_run_list: debian
+  - name: debian-7.9
+    named_run_list: debian
   - name: freebsd-10.2
-    run_list:
-      - recipe[freebsd::default]
+    named_run_list: freebsd
   - name: windows-2012r2
-    run_list:
-      - recipe[windows::default]
+    named_run_list: windows
 
 suites:
   - name: default
-    run_list:
-      - recipe[consul_spec::default]
+    provisioner:
+      policyfile: test/fixtures/policies/default.rb
     attributes:
       consul:
         config: &default-config
@@ -48,8 +41,8 @@ suites:
           datacenter: FortMeade
           encrypt: CGXC2NsXW4AvuB4h5ODYzQ==
   - name: git
-    run_list:
-      - recipe[consul_spec::default]
+    provisioner:
+      policyfile: test/fixtures/policies/default.rb
     attributes:
       consul:
         config: *default-config
@@ -58,8 +51,8 @@ suites:
     excludes:
       - windows-2012r2
   - name: webui
-    run_list:
-      - recipe[consul_spec::default]
+    provisioner:
+      policyfile: test/fixtures/policies/default.rb
     attributes:
       consul:
         config:
@@ -69,8 +62,8 @@ suites:
           datacenter: FortMeade
           encrypt: CGXC2NsXW4AvuB4h5ODYzQ==
   - name: acl
-    run_list:
-      - recipe[consul_spec::acl]
+    provisioner:
+      policyfile: test/fixtures/policies/acl.rb
     attributes:
       consul:
         config:

diff --git a/Berksfile b/Berksfile
diff --git a/Gemfile b/Gemfile
@@ -2,23 +2,22 @@ source 'https://rubygems.org'
 gem 'poise', '~> 2.2'
 gem 'poise-service', '~> 1.0'
 gem 'poise-boiler'
+gem 'chef-sugar'
 
 group :lint do
+  gem 'cookstyle'
   gem 'rubocop'
   gem 'foodcritic'
 end
 
 group :unit, :integration do
-  gem 'chef-sugar'
+  gem 'chef-dk'
   gem 'chefspec'
-  gem 'berkshelf', '~> 4.0'
-  gem 'test-kitchen', '~> 1.7.3' # 1.8 requires kitchen.yml changes to support policyfile
   gem 'serverspec'
 end
 
 group :development do
   gem 'awesome_print'
-  gem 'rake'
   gem 'stove'
 end
 

diff --git a/Policyfile.rb b/Policyfile.rb
@@ -1,4 +1,4 @@
 name 'consul'
-run_list 'consul::default'
 default_source :community
 cookbook 'consul', path: '.'
+run_list 'consul::default'
diff --git a/test/cookbooks/consul_spec/metadata.rb → ...ixtures/cookbooks/consul_spec/metadata.rb b/test/cookbooks/consul_spec/metadata.rb → ...ixtures/cookbooks/consul_spec/metadata.rb
diff --git a/test/cookbooks/consul_spec/recipes/acl.rb → ...ures/cookbooks/consul_spec/recipes/acl.rb b/test/cookbooks/consul_spec/recipes/acl.rb → ...ures/cookbooks/consul_spec/recipes/acl.rb
diff --git a/.../consul_spec/recipes/consul_definition.rb → .../consul_spec/recipes/consul_definition.rb b/.../consul_spec/recipes/consul_definition.rb → .../consul_spec/recipes/consul_definition.rb
diff --git a/...spec/recipes/consul_installation_webui.rb → ...spec/recipes/consul_installation_webui.rb b/...spec/recipes/consul_installation_webui.rb → ...spec/recipes/consul_installation_webui.rb
diff --git a/...books/consul_spec/recipes/consul_watch.rb → ...books/consul_spec/recipes/consul_watch.rb b/...books/consul_spec/recipes/consul_watch.rb → ...books/consul_spec/recipes/consul_watch.rb
diff --git a/.../cookbooks/consul_spec/recipes/default.rb → .../cookbooks/consul_spec/recipes/default.rb b/.../cookbooks/consul_spec/recipes/default.rb → .../cookbooks/consul_spec/recipes/default.rb
diff --git a/test/fixtures/policies/_base.rb b/test/fixtures/policies/_base.rb
@@ -0,0 +1,8 @@
+default_source :community
+default_source :chef_repo, '..'
+cookbook 'consul', path: '../../..'
+run_list 'consul::default', "consul_spec::#{name}"
+named_run_list :rhel, 'yum::default', run_list
+named_run_list :debian, 'apt::default', run_list
+named_run_list :freebsd, 'freebsd::default', run_list
+named_run_list :windows, 'windows::default', run_list
diff --git a/test/fixtures/policies/acl.rb b/test/fixtures/policies/acl.rb
@@ -0,0 +1,2 @@
+name 'acl'
+instance_eval(IO.read(File.expand_path('../_base.rb', __FILE__)))
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		name 'acl'
		instance_eval(IO.read(File.expand_path('../_base.rb', __FILE__)))