set java conf for wheezy too

Signed-off-by: Alfredo Deza <adeza@redhat.com>

diff --git a/ansible/slave.yml b/ansible/slave.yml
index 2d1bf62b21dd166bf122170003eacbed612e737b..832ef9448c36bcbf74ce1e0c73b8d562f1601705 100644 (file)
--- a/ansible/slave.yml
+++ b/ansible/slave.yml
@@ -78,10 +78,13 @@
         - libevent-dev
         - 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'
+      alternatives: name=java path=/usr/lib/jvm/java-7-openjdk-amd64/jre/bin/java
+      when:
+        (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'precise') or
+        (ansible_distribution == 'Debian' and ansible_distribution_release == 'wheezy')
+
 
     - name: install python-jenkins
       sudo: true

diff --git a/ansible/slave.yml.j2 b/ansible/slave.yml.j2
index 3900d72340d7d47f5f80e69449f661e4eb218fe8..18a0b210329ad921872b4035f9b0d62f44899225 100644 (file)
--- a/ansible/slave.yml.j2
+++ b/ansible/slave.yml.j2
@@ -104,7 +104,9 @@
 
     - 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'
+      when:
+        (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'precise') or
+        (ansible_distribution == 'Debian' and ansible_distribution_release == 'wheezy')
 
     - name: ensure the rpmmacros file exists to fix centos builds
       file: path="/home/{{ jenkins_user }}/.rpmmacros" owner="{{ jenkins_user }}" state=touch