Skip to content

Commit 586195d

Browse files
author
Morgan Haskel
committed
Merge pull request puppetlabs#112 from haw-hh-ai-lab/support_ubuntu_vivid
Support ubuntu vivid
2 parents 1b9bb75 + e22aa3a commit 586195d

3 files changed

Lines changed: 39 additions & 0 deletions

File tree

‎manifests/params.pp‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,22 @@
109109
},
110110
}
111111
}
112+
'vivid': {
113+
$java = {
114+
'jdk' => {
115+
'package' => 'openjdk-8-jdk',
116+
'alternative' => "java-1.8.0-openjdk-${::architecture}",
117+
'alternative_path' => "/usr/lib/jvm/java-1.8.0-openjdk-${::architecture}/bin/java",
118+
'java_home' => "/usr/lib/jvm/java-1.8.0-openjdk-${::architecture}/",
119+
},
120+
'jre' => {
121+
'package' => 'openjdk-8-jre-headless',
122+
'alternative' => "java-1.8.0-openjdk-${::architecture}",
123+
'alternative_path' => "/usr/lib/jvm/java-1.8.0-openjdk-${::architecture}/bin/java",
124+
'java_home' => "/usr/lib/jvm/java-1.8.0-openjdk-${::architecture}/",
125+
}
126+
}
127+
}
112128
}
113129
}
114130
'Solaris': {

‎spec/acceptance/nodesets/ubuntu-server-1504-x64.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
HOSTS:
2+
ubuntu-server-1504-x64:
3+
roles:
4+
- master
5+
platform: ubuntu-15.04-amd64
6+
box : puppetlabs/ubuntu-15.04-64-nocm
7+
box_url : https://vagrantcloud.com/puppetlabs/ubuntu-15.04-64-nocm
8+
hypervisor : vagrant
9+
CONFIG:
10+
log_level : debug
11+
type: git

‎spec/classes/java_spec.rb‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,18 @@
108108
it { should contain_exec('update-java-alternatives').with_command('update-java-alternatives --set bananafish --jre') }
109109
end
110110

111+
context 'select jdk for Ubuntu Vivid (15.04)' do
112+
let(:facts) { {:osfamily => 'Debian', :operatingsystem => 'Ubuntu', :lsbdistcodename => 'vivid', :operatingsystemrelease => '15.04', :architecture => 'amd64',} }
113+
let(:params) { { 'distribution' => 'jdk' } }
114+
it { should contain_package('java').with_name('openjdk-8-jdk') }
115+
end
116+
117+
context 'select jre for Ubuntu Vivid (15.04)' do
118+
let(:facts) { {:osfamily => 'Debian', :operatingsystem => 'Ubuntu', :lsbdistcodename => 'vivid', :operatingsystemrelease => '15.04', :architecture => 'amd64',} }
119+
let(:params) { { 'distribution' => 'jre' } }
120+
it { should contain_package('java').with_name('openjdk-8-jre-headless') }
121+
end
122+
111123
context 'select openjdk for Amazon Linux' do
112124
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Amazon', :operatingsystemrelease => '3.4.43-43.43.amzn1.x86_64'} }
113125
it { should contain_package('java').with_name('java-1.7.0-openjdk-devel') }

0 commit comments

Comments
 (0)