Ubuntu xenial supports openjdk-8-jdk
For more information: https://bugs.launchpad.net/ubuntu/+source/openjdk-7/+bug/1563986 Change-Id: I6cba549fc51a704a57798db15d3ad88dcdc0a4d9 Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
parent
44b28463f4
commit
e821923057
@ -35,12 +35,13 @@ class jenkins::params {
|
|||||||
}
|
}
|
||||||
'Debian': {
|
'Debian': {
|
||||||
# common packages
|
# common packages
|
||||||
$jdk_package = 'openjdk-7-jdk'
|
|
||||||
$ccache_package = 'ccache'
|
$ccache_package = 'ccache'
|
||||||
$python_netaddr_package = 'python-netaddr'
|
$python_netaddr_package = 'python-netaddr'
|
||||||
if ($::operatingsystem == 'Ubuntu') and ($::operatingsystemrelease >= '16.04') {
|
if ($::operatingsystem == 'Ubuntu') and ($::operatingsystemrelease >= '16.04') {
|
||||||
|
$jdk_package = 'openjdk-8-jdk'
|
||||||
$maven_package = 'maven'
|
$maven_package = 'maven'
|
||||||
} else {
|
} else {
|
||||||
|
$jdk_package = 'openjdk-7-jdk'
|
||||||
$maven_package = 'maven2'
|
$maven_package = 'maven2'
|
||||||
}
|
}
|
||||||
$cgroups_package = 'cgroup-bin'
|
$cgroups_package = 'cgroup-bin'
|
||||||
|
Loading…
Reference in New Issue
Block a user