]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-build.git/commitdiff
port the java jdk fix to the slave template as well 334/head
authorAlfredo Deza <adeza@redhat.com>
Fri, 4 Mar 2016 12:33:34 +0000 (07:33 -0500)
committerAlfredo Deza <adeza@redhat.com>
Fri, 4 Mar 2016 12:33:34 +0000 (07:33 -0500)
Signed-off-by: Alfredo Deza <adeza@redhat.com>
ansible/slave.yml.j2

index 5edebe8c6f26ab8a5ba08e397aeeb2f9990750a5..3900d72340d7d47f5f80e69449f661e4eb218fe8 100644 (file)
         - libffi-dev
       when: ansible_pkg_mgr  == "apt"
 
+    - name: correct java version selected
+      alternatives: name=java path=/usr/lib/jvm/java-7-openjdk-amd64/jre/bin/java
+      when: ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'precise'
+
     - name: ensure the rpmmacros file exists to fix centos builds
       file: path="/home/{{ jenkins_user }}/.rpmmacros" owner="{{ jenkins_user }}" state=touch