Install Jenkins and Java

playbooks/jenkins.yml

@@ -5,6 +5,7 @@
   vars_files:
     - "{{ secure_dir }}/vars/edxapp_ref_users.yml"
     - "{{ secure_dir }}/vars/edxapp_sandbox.yml"
+    - "vars/jenkins.yml"
   roles:
     - common
     - edxlocal

playbooks/roles/jenkins/tasks/java.yml

----
-- name: Install httplib2
-  pip: name=httplib2
-
-- name: Create JDK dir
-  command: mkdir -p {{ jdk_root }}
-
-- name: Download Java
-  uri: url={{ jdk_download_url }}
-       creates=/var/tmp/{{ jdk_archive }} 
-       dest=/var/tmp
-       HEADER_Cookie={{ jdk_cookie_header }}
-
-- name: Unpack Java
-  command: tar zxvf /var/tmp/{{ jdk_archive }} -C {{jdk_root}} 
-           creates={{ jdk_root }}/{{ jdk_folder }}
-  register: jdk_installed
-
-- name: Install java command
-  command: update-alternatives --install 
-           /usr/bin/java java 
-           {{ jdk_root }}/{{ jdk_folder }}/bin/java 1
-  only_if: ${jdk_installed.changed}
-
-- name: Install jar command
-  command: update-alternatives --install 
-           /usr/bin/jar jar 
-           {{ jdk_root }}/{{ jdk_folder }}/bin/jar 1
-  only_if: ${jdk_installed.changed}

playbooks/roles/jenkins/tasks/main.yml

 ---
 - include: jenkins.yml
-- include: java.yml
 - include: xvfb.yml

playbooks/vars/jenkins.yml

 ---
-jdk_root: /usr/local/jdk
-jdk_cookie_header: "gpw_e24=http%3A%2F%2Fwww.oracle.com"
-jdk_download_url: http://download.oracle.com/otn-pub/java/jdk/7u25-b15/jdk-7u25-linux-x64.tar.gz
-jdk_archive: jdk-7u25-linux-x64.tar.gz
-jdk_folder: jdk1.7.0_25
+jenkins_home: /var/lib/jenkins