Use Oracle Java 8 on Jenkins workers.

playbooks/roles/jenkins_worker/meta/main.yml

@@ -2,6 +2,12 @@
 dependencies:
   - common
   - jscover
+  - role: oraclejdk
+    oraclejdk_version: "8u60"
+    oraclejdk_base: "jdk1.8.0_60"
+    oraclejdk_build: "b27"
+    oraclejdk_link: "/usr/lib/jvm/java-8-oracle"
+
   # dependencies for edx-app jenkins worker:
   - role: edxapp_common
     when: platform_worker is defined

playbooks/roles/jenkins_worker/tasks/java.yml

----
-- name: Install Java
-  apt: pkg=openjdk-7-jre-headless state=present

playbooks/roles/jenkins_worker/tasks/main.yml

@@ -9,7 +9,6 @@
 - include: packer.yml
 - include: system.yml
 - include: python.yml
-- include: java.yml
 
 # only platform workers
 - include: ruby.yml

playbooks/roles/jenkins_worker/tasks/python_platform_worker.yml

@@ -47,7 +47,7 @@
     requirements={{ jenkins_home }}/shallow-clone/requirements/edx/{{ item }}
     extra_args="--exists-action=w"
     virtualenv={{ jenkins_home }}/edx-venv
-    virtualenv_command=virtualenv-2.7
+    virtualenv_command=virtualenv
     executable=pip
   with_items:
     - pre.txt
@@ -69,7 +69,7 @@
     requirements={{ jenkins_home }}/shallow-clone/requirements/edx/{{ item }}
     extra_args="--exists-action=w"
     virtualenv={{ jenkins_home }}/edx-venv
-    virtualenv_command=virtualenv-2.7
+    virtualenv_command=virtualenv
     executable=pip
   with_items:
     - post.txt

playbooks/roles/jenkins_worker/tasks/test.yml

@@ -3,9 +3,9 @@
 
 
 ### Tests ###
-- name: Verify java cmd is using v 1.7
+- name: Verify java cmd is using v 1.8
   shell: java -version
   register: java_version
 - assert:
     that:
-      - "'1.7.0' in java_version.stderr"
+      - "'1.8.0' in java_version.stderr"

playbooks/roles/oraclejdk/tasks/main.yml

@@ -33,7 +33,7 @@
     creates=/usr/lib/jvm/{{ oraclejdk_base }}
 
 - name: create symlink expected by elasticsearch
-  file: src=/usr/lib/jvm/{{ oraclejdk_base }} dest={{ oraclejdk_link }} state=link
+  file: src=/usr/lib/jvm/{{ oraclejdk_base }} dest={{ oraclejdk_link }} state=link force=yes
 
 - name: update alternatives java
   alternatives: >

playbooks/roles/sitespeedio/meta/main.yml

@@ -9,15 +9,12 @@
 #
 ##
 # Role includes for role sitespeedio
-# 
-# Example:
 #
-# dependencies:
-#   - {
-#   role: my_role 
-#   my_role_var0: "foo"
-#   my_role_var1: "bar"
-# }
 
 dependencies:
-  - oraclejdk
+  - role: oraclejdk
+    oraclejdk_version: "8u60"
+    oraclejdk_base: "jdk1.8.0_60"
+    oraclejdk_build: "b27"
+    oraclejdk_link: "/usr/lib/jvm/java-8-oracle"
+