Permalink
Browse files

Avoid Percona issues on Travis-CI which already has MySQL installed, …

…execute tests with bundler.
  • Loading branch information...
1 parent 7f00eeb commit a45a822250d5fcf7ffc87691120bf8a8140c6d4e @glennpratt glennpratt committed Oct 18, 2012
Showing with 7 additions and 3 deletions.
  1. +4 −1 .travis.yml
  2. +1 −0 Vagrantfile
  3. +2 −1 config/node.json
  4. +0 −1 roles/bakery.json
View
@@ -2,6 +2,9 @@ language: php
php:
- "5.4"
before_script:
+ - phpenv global system
+ - rm -rf cookbooks/percona
- sudo chef-solo -c config/solo.rb -j config/node.json
+ - bundle install
script:
- - cucumber tests/bakery/features
+ - bundle exec cucumber tests/bakery/features
View
@@ -13,6 +13,7 @@ Vagrant::Config.run do |config|
chef.cookbooks_path = ["cookbooks"]
chef.roles_path = "roles"
chef.data_bags_path = "data_bags"
+ chef.add_role("db-server")
chef.add_role("bakery")
chef.json.merge!({
:www_root => '/var/www',
View
@@ -1,11 +1,12 @@
{
"run_list": [
+ "recipe[mysql]",
"role[bakery]"
],
"www_root":"/var/www",
"mysql":{
"drupal_user":"bakery",
- "server_root_password":"1234",
+ "server_root_password":"",
"drupal_password":"bakery"
},
"drupal":{
View
@@ -4,7 +4,6 @@
},
"json_class": "Chef::Role",
"run_list": [
- "role[db-server]",
"role[web-server]",
"recipe[drush]",
"recipe[bakery::common]",

0 comments on commit a45a822

Please sign in to comment.