opendev/system-config
Code Issues Proposed changes

Use openjdk-1.8 packages for Fedora 21

Browse Source 
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
This commit is contained in:
Ian Wienand 2014-11-05 18:33:50 +11:00
parent aa35b32546
commit 4e1a3fd731
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/jenkins/manifests/params.pp
View File

@ -7,7 +7,11 @@ class jenkins::params {
'RedHat': { 'RedHat': {
#yum groupinstall "Development Tools" #yum groupinstall "Development Tools"
# common packages # 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' $ccache_package = 'ccache'
$python_netaddr_package = 'python-netaddr' $python_netaddr_package = 'python-netaddr'
# FIXME: No Maven packages on RHEL # FIXME: No Maven packages on RHEL