From 4b1e84a4a31764d04c25c1504e87191863b87632 Mon Sep 17 00:00:00 2001 From: Khai Do Date: Fri, 21 Feb 2014 15:37:47 -0800 Subject: [PATCH] update java alternatives to java 7 ant dependency requires java 6 so alternatives was set to java 6 on an ant package install. This change updates alternatives to point to java 7 after all packages have been installed. Change-Id: I7b8c975879dda085102a1d4740777d3d8c5f54ea --- modules/jenkins/manifests/slave.pp | 6 ++++++ .../files/jenkins_job_builder/config/macros.yaml | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/jenkins/manifests/slave.pp b/modules/jenkins/manifests/slave.pp index 0804e5d06d..be44b51852 100644 --- a/modules/jenkins/manifests/slave.pp +++ b/modules/jenkins/manifests/slave.pp @@ -80,6 +80,7 @@ class jenkins::slave( package { $packages: ensure => present, + before => Exec['update-java-alternatives'] } case $::osfamily { @@ -135,6 +136,11 @@ class jenkins::slave( ensure => present, } + exec { 'update-java-alternatives': + unless => '/bin/ls -l /etc/alternatives/java | /bin/grep java-7-openjdk-amd64', + command => '/usr/sbin/update-java-alternatives --set java-1.7.0-openjdk-amd64', + } + } default: { fail("Unsupported osfamily: ${::osfamily} The 'jenkins' module only supports osfamily Debian or RedHat (slaves only).") diff --git a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml index 50780a3112..d9a0f234dd 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml @@ -249,8 +249,6 @@ git clone https://gerrit.googlesource.com/buck cd buck git checkout 274acb17e9b6dc9ee60bc1371c47a7f49640c24c - # ant on precise depends on java6, so need to override with java7 - export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64 ant fi