Merge "update java alternatives to java 7"

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).")

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