opendev/system-config
Code Issues Proposed changes

Merge "Use openjdk-1.8 packages for Fedora 21"

Browse Source
This commit is contained in:
Jenkins 2014-11-12 21:31:45 +00:00 committed by Gerrit Code Review
commit ab35dc6ee1
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': {
#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