kitchen-inspec working via bundler

qq416296378 · Nov 10, 2015 · 4f96569 · 4f96569
1 parent ffb9305
commit 4f96569
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 30 deletions.
diff --git a/.kitchen.cloud.yml b/.kitchen.cloud.yml
@@ -12,8 +12,8 @@ provisioner:
   name: chef_zero
   require_chef_omnibus: true
 
-# verifier:
-#   name: inspec
+verifier:
+  name: inspec
 
 platforms:
 - name: centos-6.5
@@ -23,6 +23,7 @@ platforms:
     image: centos-6-5-x64
     region: <%= ENV['DIGITALOCEAN_REGION'] %>
     ssh_key_ids: <%= ENV['DIGITALOCEAN_SSH_KEYS'] %>
+  transport:
     ssh_key: <%= ENV['DIGITALOCEAN_SSH_KEY_PATH'] %>
   run_list:
   - recipe[yum-docker]
@@ -34,6 +35,7 @@ platforms:
     image: centos-7-0-x64
     region: <%= ENV['DIGITALOCEAN_REGION'] %>
     ssh_key_ids: <%= ENV['DIGITALOCEAN_SSH_KEYS'] %>
+  transport:
     ssh_key: <%= ENV['DIGITALOCEAN_SSH_KEY_PATH'] %>
   run_list:
   - recipe[yum-docker]
@@ -43,6 +45,7 @@ platforms:
 #   driver_config:
 #     image_id: ami-9a6ed3f2
 #     username: ec2-user
+#   transport:
 #     ssh_key: <%= ENV['EC2_SSH_KEY_PATH'] %>
 #  run_list:
 #  - recipe[yum-docker]
@@ -54,6 +57,7 @@ platforms:
     image: fedora-21-x64
     region: <%= ENV['DIGITALOCEAN_REGION'] %>
     ssh_key_ids: <%= ENV['DIGITALOCEAN_SSH_KEYS'] %>
+  transport:
     ssh_key: <%= ENV['DIGITALOCEAN_SSH_KEY_PATH'] %>
   run_list:
   - recipe[yum-docker]
@@ -78,6 +82,7 @@ platforms:
     image: ubuntu-12-04-x64
     region: <%= ENV['DIGITALOCEAN_REGION'] %>
     ssh_key_ids: <%= ENV['DIGITALOCEAN_SSH_KEYS'] %>
+  transport:
     ssh_key: <%= ENV['DIGITALOCEAN_SSH_KEY_PATH'] %>
   run_list:
   - recipe[apt]
@@ -90,6 +95,7 @@ platforms:
     image: ubuntu-14-04-x64
     region: <%= ENV['DIGITALOCEAN_REGION'] %>
     ssh_key_ids: <%= ENV['DIGITALOCEAN_SSH_KEYS'] %>
+  transport:
     ssh_key: <%= ENV['DIGITALOCEAN_SSH_KEY_PATH'] %>
   run_list:
   - recipe[apt]
@@ -103,6 +109,8 @@ platforms:
     region: <%= ENV['DIGITALOCEAN_REGION'] %>
     ssh_key_ids: <%= ENV['DIGITALOCEAN_SSH_KEYS'] %>
     ssh_key: <%= ENV['DIGITALOCEAN_SSH_KEY_PATH'] %>
+  transport:
+    ssh_key: <%= ENV['DIGITALOCEAN_SSH_KEY_PATH'] %>
   run_list:
   - recipe[apt]
   - recipe[apt-docker]

diff --git a/Gemfile b/Gemfile
@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+gem 'kitchen-digitalocean', path: '../../kitchen-digitalocean'
+gem 'kitchen-ec2'
+gem 'kitchen-sync'
+gem 'berkshelf'
+gem 'kitchen-inspec'
+
diff --git a/test/integration/resources-162/serverspec/assert_functioning_spec.rb b/test/integration/resources-162/serverspec/assert_functioning_spec.rb
@@ -1,7 +1,4 @@
-require 'serverspec'
-
-set :backend, :exec
-puts "os: #{os}"
+#
 
 docker_version_string = command('docker -v').stdout
 docker_version = docker_version_string.split(/\s/)[2].split(',')[0]
@@ -96,7 +93,7 @@
 
 describe file('/hello-world.tar') do
   it { should be_file }
-  it { should be_mode 644 }
+  it { should be_mode 0644 }
 end
 
 # docker_image[image-1]
@@ -762,10 +759,10 @@
   its(:stdout) { should match(/Exited \(137\)/) }
 end
 
-kill_after_start = `docker inspect -f '{{.State.StartedAt}}' kill_after`
+kill_after_start = command("docker inspect -f '{{.State.StartedAt}}' kill_after").stdout
 kill_after_start = DateTime.parse(kill_after_start).to_time.to_i
 
-kill_after_finish = `docker inspect -f '{{.State.FinishedAt}}' kill_after`
+kill_after_finish = command("docker inspect -f '{{.State.FinishedAt}}' kill_after").stdout
 kill_after_finish = DateTime.parse(kill_after_finish).to_time.to_i
 
 kill_after_run_time = kill_after_finish - kill_after_start

diff --git a/test/integration/resources-171/serverspec/assert_functioning_spec.rb b/test/integration/resources-171/serverspec/assert_functioning_spec.rb
@@ -1,7 +1,4 @@
-require 'serverspec'
-
-set :backend, :exec
-puts "os: #{os}"
+#
 
 docker_version_string = command('docker -v').stdout
 docker_version = docker_version_string.split(/\s/)[2].split(',')[0]
@@ -96,7 +93,7 @@
 
 describe file('/hello-world.tar') do
   it { should be_file }
-  it { should be_mode 644 }
+  it { should be_mode 0644 }
 end
 
 # docker_image[image-1]
@@ -762,10 +759,10 @@
   its(:stdout) { should match(/Exited \(137\)/) }
 end
 
-kill_after_start = `docker inspect -f '{{.State.StartedAt}}' kill_after`
+kill_after_start = command("docker inspect -f '{{.State.StartedAt}}' kill_after").stdout
 kill_after_start = DateTime.parse(kill_after_start).to_time.to_i
 
-kill_after_finish = `docker inspect -f '{{.State.FinishedAt}}' kill_after`
+kill_after_finish = command("docker inspect -f '{{.State.FinishedAt}}' kill_after").stdout
 kill_after_finish = DateTime.parse(kill_after_finish).to_time.to_i
 
 kill_after_run_time = kill_after_finish - kill_after_start

diff --git a/test/integration/resources-183/serverspec/assert_functioning_spec.rb b/test/integration/resources-183/serverspec/assert_functioning_spec.rb
@@ -1,7 +1,4 @@
-require 'serverspec'
-
-set :backend, :exec
-puts "os: #{os}"
+#
 
 docker_version_string = command('docker -v').stdout
 docker_version = docker_version_string.split(/\s/)[2].split(',')[0]
@@ -96,7 +93,7 @@
 
 describe file('/hello-world.tar') do
   it { should be_file }
-  it { should be_mode 644 }
+  it { should be_mode 0644 }
 end
 
 # docker_image[image-1]
@@ -762,10 +759,10 @@
   its(:stdout) { should match(/Exited \(137\)/) }
 end
 
-kill_after_start = `docker inspect -f '{{.State.StartedAt}}' kill_after`
+kill_after_start = command("docker inspect -f '{{.State.StartedAt}}' kill_after").stdout
 kill_after_start = DateTime.parse(kill_after_start).to_time.to_i
 
-kill_after_finish = `docker inspect -f '{{.State.FinishedAt}}' kill_after`
+kill_after_finish = command("docker inspect -f '{{.State.FinishedAt}}' kill_after").stdout
 kill_after_finish = DateTime.parse(kill_after_finish).to_time.to_i
 
 kill_after_run_time = kill_after_finish - kill_after_start

diff --git a/test/integration/resources-190/serverspec/assert_functioning_spec.rb b/test/integration/resources-190/serverspec/assert_functioning_spec.rb
@@ -1,7 +1,4 @@
-require 'serverspec'
-
-set :backend, :exec
-puts "os: #{os}"
+#
 
 docker_version_string = command('docker -v').stdout
 docker_version = docker_version_string.split(/\s/)[2].split(',')[0]
@@ -96,7 +93,7 @@
 
 describe file('/hello-world.tar') do
   it { should be_file }
-  it { should be_mode 644 }
+  it { should be_mode 0644 }
 end
 
 # docker_image[image-1]
@@ -762,10 +759,10 @@
   its(:stdout) { should match(/Exited \(137\)/) }
 end
 
-kill_after_start = `docker inspect -f '{{.State.StartedAt}}' kill_after`
+kill_after_start = command("docker inspect -f '{{.State.StartedAt}}' kill_after").stdout
 kill_after_start = DateTime.parse(kill_after_start).to_time.to_i
 
-kill_after_finish = `docker inspect -f '{{.State.FinishedAt}}' kill_after`
+kill_after_finish = command("docker inspect -f '{{.State.FinishedAt}}' kill_after").stdout
 kill_after_finish = DateTime.parse(kill_after_finish).to_time.to_i
 
 kill_after_run_time = kill_after_finish - kill_after_start