Merge pull request #1791 from edx/benp/add-js-cover-devstack

Add JS Cover for both local dev and jenkins_worker.

playbooks/roles/jenkins_worker/defaults/main.yml

@@ -15,10 +15,6 @@ jenkins_debian_pkgs:
 jenkins_rbenv_root: "{{ jenkins_home }}/.rbenv"
 jenkins_ruby_version: "1.9.3-p374"
 
-# JSCover direct download URL
-jscover_url: "http://files.edx.org/testeng/JSCover-1.0.2.zip"
-jscover_version: "1.0.2"
-
 # packer direct download URL
 packer_url: "https://dl.bintray.com/mitchellh/packer/0.6.1_linux_amd64.zip"
 

playbooks/roles/jenkins_worker/meta/main.yml

 ---
 dependencies:
   - common
+  - jscover
   - role: rbenv
     rbenv_user: "{{ jenkins_user }}"
     rbenv_dir: "{{ jenkins_home }}"

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

@@ -12,5 +12,5 @@
 - include: system.yml
 - include: python.yml
 - include: ruby.yml
-- include: jscover.yml
+- include: java.yml
 - include: test.yml

playbooks/roles/jscover/defaults/main.yml

+---
+# Installs JSCover jar.
+# Java is a pre-requisite for JSCover. This role is not responsible
+# for installing Java.
+#
+jscover_role_name: jscover
+
+# JSCover direct download URL
+jscover_version: "1.0.2"
+jscover_url: "http://files.edx.org/testeng/JSCover-{{ jscover_version }}.zip"

playbooks/roles/jenkins_worker/tasks/jscover.yml → playbooks/roles/jscover/tasks/main.yml

 ---
-- name: Install Java
-  apt: pkg=openjdk-7-jre-headless state=present
 
 - name: Download JSCover
   get_url: url={{ jscover_url }} dest=/var/tmp/jscover.zip
@@ -16,3 +14,4 @@
 - name: Set JSCover permissions
   file: path="/usr/local/bin/JSCover-all-{{ jscover_version }}.jar" state=file
         owner=root group=root mode=0755
+

playbooks/roles/local_dev/defaults/main.yml

@@ -25,3 +25,5 @@ local_dev_pkgs:
     - emacs
     - xorg
     - openbox
+
+localdev_jscover_version: "1.0.2"

playbooks/roles/local_dev/meta/main.yml

+---
+dependencies:
+  - role: jscover
+    jscover_version: "{{ localdev_jscover_version }}"

playbooks/roles/local_dev/templates/app_bashrc.j2

@@ -31,3 +31,5 @@ fi
 cd "{{ item.home }}/{{ item.repo }}"
 
 source "{{ item.home }}/.paver_autocomplete"
+
+export JSCOVER_JAR="/usr/local/bin/JSCover-all-{{ localdev_jscover_version }}.jar"