Skip to content

Commit

Permalink
update travis and remove openstack gem
Browse files Browse the repository at this point in the history
  • Loading branch information
chris-rock committed May 29, 2016
1 parent 04c57ef commit b382784
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 29 deletions.
3 changes: 2 additions & 1 deletion .kitchen.vagrant.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
---
driver:
name: vagrant

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

platforms:
- name: ubuntu-12.04
driver_config:
Expand Down
25 changes: 6 additions & 19 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,37 +8,24 @@ services:
- docker

before_install:
- gem install bundler
- gem --version
- bundle version

matrix:
include:
# verify lint and unit
- rvm: 1.9.3
gemfile: Gemfile
bundler_args: "--without integration guard tools"
- rvm: 1.9.3
gemfile: gemfile.chef-11
bundler_args: "--without integration guard tools"
- rvm: 2.2.4
gemfile: Gemfile
bundler_args: "--without integration guard tools"
- rvm: 2.2.4
gemfile: gemfile.chef-11
bundler_args: "--without integration guard tools"
- rvm: ruby-head
- rvm: 2.3.1
gemfile: Gemfile
bundler_args: "--without integration guard tools"
- rvm: ruby-head
gemfile: gemfile.chef-11
bundler_args: "--without integration guard tools"
- rvm: 2.2.4
# integration tests
- rvm: 2.3.1
bundler_args: "--without guard tools"
script: bundle exec rake test:integration OS='centos oracle'
gemfile: Gemfile
- rvm: 2.2.4
- rvm: 2.3.1
bundler_args: "--without guard tools"
script: bundle exec rake test:integration OS='ubuntu debian'
gemfile: Gemfile
allow_failures:
- rvm: ruby-head
- rvm: 1.9.3
4 changes: 0 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,6 @@ group :integration do
gem 'kitchen-dokken'
end

group :openstack do
gem 'kitchen-openstack'
end

group :tools do
gem 'github_changelog_generator', '~> 1.12.0'
end
5 changes: 0 additions & 5 deletions gemfile.chef-11
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

source 'https://rubygems.org'

gem 'berkshelf', '~> 4.0'
gem 'chef', '~> 11.18'

# pin dependency for Ruby 1.9.3 since bundler is not
Expand Down Expand Up @@ -35,7 +34,3 @@ group :integration do
gem 'kitchen-dokken'
gem 'kitchen-sharedtests', '~> 0.2.0'
end

group :openstack do
gem 'kitchen-openstack'
end

0 comments on commit b382784

Please sign in to comment.