Skip to content

Commit

Permalink
Fix test failures for source recipe, add EL7 support.
Browse files Browse the repository at this point in the history
This fixes #41 as well as adds support for Ubuntu 10.04 and EL7.
  • Loading branch information
johnbellone committed Dec 11, 2014
1 parent 7c74f79 commit 1434137
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 10 deletions.
18 changes: 10 additions & 8 deletions .kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,14 @@ provisioner:
name: chef_zero

platforms:
- name: ubuntu-12.04
- name: ubuntu-14.04
- name: centos-6.5
attributes:
golang:
install_dir: '/usr'
- name: ubuntu-12.04
- name: ubuntu-10.04
- name: centos-7.0
- name: centos-6.0
- name: centos-5.10
run_list:
- recipe[yum-repoforge::default]
attributes:
golang:
install_dir: '/usr'

suites:
- name: default
Expand All @@ -29,6 +25,12 @@ suites:
bind_interface: eth0
advertise_interface: eth0
encrypt: CGXC2NsXW4AvuB4h5ODYzQ==
- name: source
run_list:
- recipe[consul::default]
attributes:
consul:
install_method: source
- name: runit
run_list:
- recipe[consul::default]
Expand Down
3 changes: 2 additions & 1 deletion metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@
supports name, '~> 5.10'
end

supports 'ubuntu', '= 10.04'
supports 'ubuntu', '= 12.04'
supports 'ubuntu', '= 14.04'

depends 'ark'
depends 'golang', '~> 1.3.0'
depends 'golang', '~> 1.5.0'
depends 'runit'
depends 'yum-repoforge'
2 changes: 1 addition & 1 deletion spec/unit/recipes/install_source_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

describe_recipe 'consul::install_source' do
before do
stub_command("/usr/local/go/bin/go version | grep \"go1.2 \"").and_return(false)
stub_command("/opt/go/bin/go version | grep \"go1.3 \"").and_return(false)
end

it { expect(chef_run).to include_recipe('golang::default') }
Expand Down

0 comments on commit 1434137

Please sign in to comment.