opendev
/
puppet-jenkins
Code Issues Proposed changes

Don't update-java-alternatives on ubuntu-xenial 

As we are using openjdk-8-jre by default.

Change-Id: I57e27498fea13276086b1145603220e9244b9bc6
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2016-03-31 15:40:50 -04:00
parent e821923057
commit ea7e530fe0
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/slave.pp
View File

@ -80,10 +80,12 @@ class jenkins::slave(
require => Package[$::jenkins::params::jdk_package],
}
exec { 'update-java-alternatives':
unless => "/bin/ls -l /etc/alternatives/java | /bin/grep java-7-openjdk-${::dpkg_arch}",
command => "/usr/sbin/update-java-alternatives --set java-1.7.0-openjdk-${::dpkg_arch}",
require => Anchor['jenkins::slave::update-java-alternatives']
if ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '16.04') < 0) {
exec { 'update-java-alternatives':
unless => "/bin/ls -l /etc/alternatives/java | /bin/grep java-7-openjdk-${::dpkg_arch}",
command => "/usr/sbin/update-java-alternatives --set java-1.7.0-openjdk-${::dpkg_arch}",
require => Anchor['jenkins::slave::update-java-alternatives']
}
}
}
default: {