From 526eb6cecec60d7e672764f1c9a9c9daa70246a5 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Fri, 4 Mar 2016 07:33:34 -0500 Subject: [PATCH] port the java jdk fix to the slave template as well Signed-off-by: Alfredo Deza --- ansible/slave.yml.j2 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ansible/slave.yml.j2 b/ansible/slave.yml.j2 index 5edebe8c..3900d723 100644 --- a/ansible/slave.yml.j2 +++ b/ansible/slave.yml.j2 @@ -102,6 +102,10 @@ - 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 -- 2.47.3