add support for ubuntu vivid (15.04) using openjdk-8
add acceptance test node without really understanding what it does. add test for distribution type jdk for Ubuntu vivid
This commit is contained in:
@@ -109,6 +109,22 @@ class java::params {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
'vivid': {
|
||||||
|
$java = {
|
||||||
|
'jdk' => {
|
||||||
|
'package' => 'openjdk-8-jdk',
|
||||||
|
'alternative' => "java-1.8.0-openjdk-${::architecture}",
|
||||||
|
'alternative_path' => "/usr/lib/jvm/java-1.8.0-openjdk-${::architecture}/bin/java",
|
||||||
|
'java_home' => "/usr/lib/jvm/java-1.8.0-openjdk-${::architecture}/",
|
||||||
|
},
|
||||||
|
'jre' => {
|
||||||
|
'package' => 'openjdk-8-jre-headless',
|
||||||
|
'alternative' => "java-1.8.0-openjdk-${::architecture}",
|
||||||
|
'alternative_path' => "/usr/lib/jvm/java-1.8.0-openjdk-${::architecture}/bin/java",
|
||||||
|
'java_home' => "/usr/lib/jvm/java-1.8.0-openjdk-${::architecture}/",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
'Solaris': {
|
'Solaris': {
|
||||||
|
|||||||
11
spec/acceptance/nodesets/ubuntu-server-1504-x64.yml
Normal file
11
spec/acceptance/nodesets/ubuntu-server-1504-x64.yml
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
HOSTS:
|
||||||
|
ubuntu-server-1504-x64:
|
||||||
|
roles:
|
||||||
|
- master
|
||||||
|
platform: ubuntu-15.04-amd64
|
||||||
|
box : puppetlabs/ubuntu-15.04-64-nocm
|
||||||
|
box_url : https://vagrantcloud.com/puppetlabs/ubuntu-15.04-64-nocm
|
||||||
|
hypervisor : vagrant
|
||||||
|
CONFIG:
|
||||||
|
log_level : debug
|
||||||
|
type: git
|
||||||
@@ -108,6 +108,18 @@ describe 'java', :type => :class do
|
|||||||
it { should contain_exec('update-java-alternatives').with_command('update-java-alternatives --set bananafish --jre') }
|
it { should contain_exec('update-java-alternatives').with_command('update-java-alternatives --set bananafish --jre') }
|
||||||
end
|
end
|
||||||
|
|
||||||
|
context 'select jdk for Ubuntu Vivid (15.04)' do
|
||||||
|
let(:facts) { {:osfamily => 'Debian', :operatingsystem => 'Ubuntu', :lsbdistcodename => 'vivid', :operatingsystemrelease => '15.04', :architecture => 'amd64',} }
|
||||||
|
let(:params) { { 'distribution' => 'jdk' } }
|
||||||
|
it { should contain_package('java').with_name('openjdk-8-jdk') }
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'select jre for Ubuntu Vivid (15.04)' do
|
||||||
|
let(:facts) { {:osfamily => 'Debian', :operatingsystem => 'Ubuntu', :lsbdistcodename => 'vivid', :operatingsystemrelease => '15.04', :architecture => 'amd64',} }
|
||||||
|
let(:params) { { 'distribution' => 'jre' } }
|
||||||
|
it { should contain_package('java').with_name('openjdk-8-jre-headless') }
|
||||||
|
end
|
||||||
|
|
||||||
context 'select openjdk for Amazon Linux' do
|
context 'select openjdk for Amazon Linux' do
|
||||||
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Amazon', :operatingsystemrelease => '3.4.43-43.43.amzn1.x86_64'} }
|
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Amazon', :operatingsystemrelease => '3.4.43-43.43.amzn1.x86_64'} }
|
||||||
it { should contain_package('java').with_name('java-1.7.0-openjdk-devel') }
|
it { should contain_package('java').with_name('java-1.7.0-openjdk-devel') }
|
||||||
|
|||||||
Reference in New Issue
Block a user