diff --git a/.kitchen.yml b/.kitchen.yml index 87e3194f..1a8230bb 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -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 @@ -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] diff --git a/metadata.rb b/metadata.rb index 77fe7cfc..36bca347 100644 --- a/metadata.rb +++ b/metadata.rb @@ -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' diff --git a/spec/unit/recipes/install_source_spec.rb b/spec/unit/recipes/install_source_spec.rb index 3bc34bd7..825512fa 100644 --- a/spec/unit/recipes/install_source_spec.rb +++ b/spec/unit/recipes/install_source_spec.rb @@ -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') }