From 4e1a3fd7317c27fa46d1e1af22a3f2bd54d02160 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Wed, 5 Nov 2014 18:33:50 +1100 Subject: [PATCH] Use openjdk-1.8 packages for Fedora 21 Puppet installs on Fedora 21 fail with: --- Error: /Stage[main]/Jenkins::Slave/Package[java-1.7.0-openjdk-devel]/ensure: change from absent to present failed: Execution of '/usr/bin/yum -d 0 -e 0 -y list java-1.7.0-openjdk-devel' returned 1: Error: No matching Packages to list --- Fedora 21 has retired openjdk-1.7 for 1.8; see [1] [1] http://fedoraproject.org/wiki/Changes/Java8 Change-Id: I06b6d97000f67d099d9886f75f528a41aa68e8e7 --- modules/jenkins/manifests/params.pp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/jenkins/manifests/params.pp b/modules/jenkins/manifests/params.pp index 57a09bd8b2..12a2a60420 100644 --- a/modules/jenkins/manifests/params.pp +++ b/modules/jenkins/manifests/params.pp @@ -7,7 +7,11 @@ class jenkins::params { 'RedHat': { #yum groupinstall "Development Tools" # common packages - $jdk_package = 'java-1.7.0-openjdk-devel' + if ($::operatingsystem == 'Fedora') and ($::operatingsystemrelease >= 21) { + $jdk_package = 'java-1.8.0-openjdk-devel' + } else { + $jdk_package = 'java-1.7.0-openjdk-devel' + } $ccache_package = 'ccache' $python_netaddr_package = 'python-netaddr' # FIXME: No Maven packages on RHEL