Skip to content

Commit

Permalink
Update test files
Browse files Browse the repository at this point in the history
* Pin omnibus version at 11.8.2, redisio remote file resource failure.
* Remove explicit nil on databag_certificate_id, fails on Ubuntu
* Remove support Gemfile, and update travis.yml
  • Loading branch information
atomic-penguin committed Feb 9, 2014
1 parent 6a2de1c commit ef2dada
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .kitchen.yml
@@ -1,7 +1,7 @@
---
driver_plugin: vagrant
driver_config:
require_chef_omnibus: latest
require_chef_omnibus: '11.8.2'
customize:
memory: 1024

Expand Down
5 changes: 2 additions & 3 deletions .travis.yml
@@ -1,6 +1,5 @@
language: ruby
gemfile:
- test/support/Gemfile
rvm:
- 1.9.3
script: BUNDLE_GEMFILE=test/support/Gemfile bundle exec rake
install: bundle install --without integration
script: bundle exec rake
13 changes: 8 additions & 5 deletions Gemfile
@@ -1,7 +1,10 @@
source 'http://rubygems.org'

gem 'berkshelf'
gem 'chefspec'
gem 'foodcritic', '~> 3.0.0'
gem 'test-kitchen'
gem 'kitchen-vagrant'
gem 'berkshelf', '~> 2.0'
gem 'chefspec', '~> 3.2'
gem 'foodcritic', '~> 3.0'

group :integration do
gem 'test-kitchen'
gem 'kitchen-vagrant'
end
2 changes: 1 addition & 1 deletion attributes/default.rb
Expand Up @@ -86,7 +86,7 @@
default['gitlab']['trust_local_sshkeys'] = 'yes'

default['gitlab']['https'] = false
default['gitlab']['certificate_databag_id'] = nil
default['gitlab']['certificate_databag_id']
default['gitlab']['self_signed_cert'] = false
default['gitlab']['ssl_certificate'] = "/etc/nginx/ssl/certs/#{node['fqdn']}.pem"
default['gitlab']['ssl_certificate_key'] = "/etc/nginx/ssl/private/#{node['fqdn']}.key"
Expand Down
6 changes: 0 additions & 6 deletions test/support/Gemfile

This file was deleted.

0 comments on commit ef2dada

Please sign in to comment.