Skip to content

Commit

Permalink
Fix config to run integration tests in Travis
Browse files Browse the repository at this point in the history
  • Loading branch information
jeffbyrnes committed Aug 13, 2015
1 parent d7c3c32 commit 3f16fd8
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -2,7 +2,7 @@ language: ruby
cache: bundler
rvm:
- 2.1
bundler_args: "--deployment --without integration"
bundler_args: "--deployment --without vagrant"
before_install:
- openssl aes-256-cbc -K $encrypted_7eb6a5adb463_key -iv $encrypted_7eb6a5adb463_iv
-in travis_ci_ec2.pem.enc -out ~/.ssh/travis_ci_ec2.pem -d
Expand Down
4 changes: 4 additions & 0 deletions Gemfile
Expand Up @@ -11,5 +11,9 @@ end

group :integration do
gem 'test-kitchen', '~> 1.3'
gem 'kitchen-ec2', '~> 0.10'
end

group :vagrant do
gem 'kitchen-vagrant', '~> 0.15'
end
15 changes: 15 additions & 0 deletions Gemfile.lock
Expand Up @@ -5,6 +5,12 @@ GEM
ast (2.1.0)
astrolabe (1.3.1)
parser (~> 2.2)
aws-sdk (2.1.14)
aws-sdk-resources (= 2.1.14)
aws-sdk-core (2.1.14)
jmespath (~> 1.0)
aws-sdk-resources (2.1.14)
aws-sdk-core (= 2.1.14)
berkshelf (3.3.0)
addressable (~> 2.3.4)
berkshelf-api-client (~> 1.2)
Expand Down Expand Up @@ -92,6 +98,7 @@ GEM
domain_name (0.5.24)
unf (>= 0.0.5, < 1.0.0)
erubis (2.7.0)
excon (0.45.4)
faraday (0.9.1)
multipart-post (>= 1.2, < 3)
fauxhai (2.3.0)
Expand All @@ -117,7 +124,14 @@ GEM
domain_name (~> 0.5)
httpclient (2.6.0.1)
ipaddress (0.8.0)
jmespath (1.0.2)
multi_json (~> 1.0)
json (1.8.3)
kitchen-ec2 (0.10.0)
aws-sdk (~> 2)
excon
multi_json
test-kitchen (~> 1.4, >= 1.4.1)
kitchen-vagrant (0.18.0)
test-kitchen (~> 1.4)
libyajl2 (1.2.0)
Expand Down Expand Up @@ -281,6 +295,7 @@ DEPENDENCIES
chefspec (~> 4.2)
coveralls (~> 0.7)
foodcritic (~> 4.0)
kitchen-ec2 (~> 0.10)
kitchen-vagrant (~> 0.15)
rubocop (~> 0.29)
test-kitchen (~> 1.3)

0 comments on commit 3f16fd8

Please sign in to comment.