Skip to content

Commit

Permalink
Merge pull request #6 from ehaselwanter/master
Browse files Browse the repository at this point in the history
integrate sharedtests
  • Loading branch information
chris-rock committed May 19, 2014
2 parents 076434e + 286f7a0 commit e4f0321
Show file tree
Hide file tree
Showing 10 changed files with 201 additions and 425 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
README.pdf
README.html
shared_test_repo/
test/integration
.kitchen

3 changes: 2 additions & 1 deletion .kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ driver:

provisioner:
name: chef_solo
test_repo_uri: "https://github.com/TelekomLabs/tests-ssh-hardening.git"

platforms:
- name: ubuntu-12.04
Expand Down Expand Up @@ -40,4 +41,4 @@ platforms:
suites:
- name: default
run_list:
- role[ssh]
- ['recipe[ssh-hardening]','recipe[chef-solo-search]']
11 changes: 11 additions & 0 deletions Berksfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
DEPENDENCIES
chef-solo-search
git: https://github.com/edelight/chef-solo-search
revision: 848fad1461c78fd502975f1df2e14eed12610635
ssh-hardening
path: .
metadata: true

GRAPH
chef-solo-search (0.5.1)
ssh-hardening (1.0.0)
10 changes: 10 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
source 'https://rubygems.org'

gem 'berkshelf', '~> 3.0'
gem 'chef', '~> 11.12'

group :integration do
gem 'test-kitchen', '~> 1.0'
gem 'kitchen-vagrant'
gem 'kitchen-sharedtests', '~> 0.2.0'
end
166 changes: 166 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,166 @@
GEM
remote: https://rubygems.org/
specs:
addressable (2.3.6)
berkshelf (3.1.2)
addressable (~> 2.3.4)
berkshelf-api-client (~> 1.2)
buff-config (~> 0.4)
buff-extensions (~> 0.4)
buff-shell_out (~> 0.1)
celluloid (~> 0.16.0.pre)
celluloid-io (~> 0.16.0.pre)
faraday (~> 0.9.0)
minitar (~> 0.5.4)
octokit (~> 3.0)
retryable (~> 1.3.3)
ridley (~> 3.1)
solve (~> 1.1)
thor (~> 0.18)
berkshelf-api-client (1.2.0)
faraday (~> 0.9.0)
buff-config (0.4.0)
buff-extensions (~> 0.3)
varia_model (~> 0.1)
buff-extensions (0.5.0)
buff-ignore (1.1.1)
buff-ruby_engine (0.1.0)
buff-shell_out (0.1.1)
buff-ruby_engine (~> 0.1.0)
celluloid (0.16.0.pre)
timers (~> 2.0.0)
celluloid-io (0.16.0.pre)
celluloid (>= 0.16.0.pre)
nio4r (>= 1.0.0)
chef (11.12.4)
chef-zero (~> 2.0, >= 2.0.2)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
highline (~> 1.6, >= 1.6.9)
json (>= 1.4.4, <= 1.8.1)
mime-types (~> 1.16)
mixlib-authentication (~> 1.3)
mixlib-cli (~> 1.4)
mixlib-config (~> 2.0)
mixlib-log (~> 1.3)
mixlib-shellout (~> 1.4)
net-ssh (~> 2.6)
net-ssh-multi (~> 1.1)
ohai (~> 7.0.4)
pry (~> 0.9)
rest-client (>= 1.0.4, < 1.7.0)
yajl-ruby (~> 1.1)
chef-zero (2.0.2)
hashie (~> 2.0)
json
mixlib-log (~> 1.3)
rack
coderay (1.1.0)
dep-selector-libgecode (1.0.0)
dep_selector (1.0.3)
dep-selector-libgecode (~> 1.0)
ffi (~> 1.9)
diff-lcs (1.2.5)
erubis (2.7.0)
faraday (0.9.0)
multipart-post (>= 1.2, < 3)
ffi (1.9.3)
git (1.2.6)
hashie (2.1.1)
highline (1.6.21)
hitimes (1.2.1)
ipaddress (0.8.0)
json (1.8.1)
kitchen-sharedtests (0.2.0)
git
kitchen-vagrant (0.15.0)
test-kitchen (~> 1.0)
method_source (0.8.2)
mime-types (1.25.1)
minitar (0.5.4)
mixlib-authentication (1.3.0)
mixlib-log
mixlib-cli (1.5.0)
mixlib-config (2.1.0)
mixlib-log (1.6.0)
mixlib-shellout (1.4.0)
multipart-post (2.0.0)
net-http-persistent (2.9.4)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (2.9.1)
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
net-ssh-multi (1.2.0)
net-ssh (>= 2.6.5)
net-ssh-gateway (>= 1.2.0)
nio4r (1.0.0)
octokit (3.1.0)
sawyer (~> 0.5.3)
ohai (7.0.4)
ipaddress
mime-types (~> 1.16)
mixlib-cli
mixlib-config (~> 2.0)
mixlib-log
mixlib-shellout (~> 1.2)
systemu (~> 2.5.2)
yajl-ruby
pry (0.9.12.6)
coderay (~> 1.0)
method_source (~> 0.8)
slop (~> 3.4)
rack (1.5.2)
rest-client (1.6.7)
mime-types (>= 1.16)
retryable (1.3.5)
ridley (3.1.0)
addressable
buff-config (~> 0.2)
buff-extensions (~> 0.3)
buff-ignore (~> 1.1)
buff-shell_out (~> 0.1)
celluloid (~> 0.16.0.pre)
celluloid-io (~> 0.16.0.pre)
erubis
faraday (~> 0.9.0)
hashie (>= 2.0.2)
json (>= 1.7.7)
mixlib-authentication (>= 1.3.0)
net-http-persistent (>= 2.8)
retryable
semverse (~> 1.1)
varia_model (~> 0.3)
safe_yaml (1.0.3)
sawyer (0.5.4)
addressable (~> 2.3.5)
faraday (~> 0.8, < 0.10)
semverse (1.1.0)
slop (3.5.0)
solve (1.2.0)
dep_selector (~> 1.0)
semverse (~> 1.1)
systemu (2.5.2)
test-kitchen (1.2.1)
mixlib-shellout (~> 1.2)
net-scp (~> 1.1)
net-ssh (~> 2.7)
safe_yaml (~> 1.0)
thor (~> 0.18)
thor (0.19.1)
timers (2.0.0)
hitimes
varia_model (0.3.2)
buff-extensions (~> 0.2)
hashie (>= 2.0.2)
yajl-ruby (1.1.0)

PLATFORMS
ruby

DEPENDENCIES
berkshelf (~> 3.0)
chef (~> 11.12)
kitchen-sharedtests (~> 0.2.0)
kitchen-vagrant
test-kitchen (~> 1.0)
8 changes: 8 additions & 0 deletions Thorfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# encoding: utf-8

require 'bundler'
require 'bundler/setup'
require 'kitchen_sharedtests'
require 'kitchen/sharedtests_thor_tasks'

Kitchen::SharedtestsThorTasks.new
4 changes: 0 additions & 4 deletions test/integration/data_bags/users/dada.json

This file was deleted.

15 changes: 0 additions & 15 deletions test/integration/default/roles/ssh.json

This file was deleted.

12 changes: 0 additions & 12 deletions test/integration/default/serverspec/spec_helper.rb

This file was deleted.

Loading

0 comments on commit e4f0321

Please sign in to comment.