From ea7e530fe092fe0931d6c68f9695ccd8512adb4f Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Thu, 31 Mar 2016 15:40:50 -0400
Subject: [PATCH] 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>
---
 manifests/slave.pp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/manifests/slave.pp b/manifests/slave.pp
index 8cad4ec..f9f4586 100644
--- a/manifests/slave.pp
+++ b/manifests/slave.pp
@@ -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: {