Merge pull request #316 from edx/will/jenkins-chrome-version

Will/jenkins chrome version

playbooks/roles/jenkins_worker/defaults/main.yml

@@ -31,6 +31,12 @@ jenkins_debian_pkgs:
     - unzip
     - xml-twig-tools
 
+# Chrome and ChromeDriver
+chrome_apt_key: "https://dl-ssl.google.com/linux/linux_signing_key.pub"
+chrome_apt_repo: "http://dl.google.com/linux/chrome/deb/"
+chromedriver_version: 2.3
+chromedriver_url: "http://chromedriver.storage.googleapis.com/{{ chromedriver_version }}/chromedriver_linux64.zip"
+
 # Ruby Specific Vars
 rbenv_root: "{{ jenkins_user_home }}/.rbenv"
 rbenv_repo: "https://github.com/sstephenson/rbenv.git"

playbooks/roles/jenkins_worker/tasks/browsers.yml

@@ -23,19 +23,21 @@
 - name: jenkins_worker | Install Chrome dependencies
   apt: pkg=libgconf2-4,libxss1,libnss3-1d,libcurl3,xdg-utils
 
-- name: jenkins_worker | Install Google Chrome
-  get_url: url=https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb dest=/var/tmp/google-chrome-stable_current_amd64.deb
+- name: jenkins_worker | Google Chrome apt key
+  apt_key: url={{ chrome_apt_key }} state=present
+
+- name: jenkins_worker | Google Chrome apt repo
+  apt_repository: repo='deb {{ chrome_apt_repo }} stable main'
 
-- name: jenkins_worker | Install Google Chrome 2
-  command: dpkg -i google-chrome-stable_current_amd64.deb
-           chdir=/var/tmp
-  ignore_errors: True
+- name: jenkins_worker | Install Google Chrome
+  apt: pkg=google-chrome-stable state=present update_cache=yes
 
 - name: jenkins_worker | Install ChromeDriver
-  get_url: url=https://chromedriver.googlecode.com/files/chromedriver_linux64_2.1.zip dest=/var/tmp/chromedriver_linux64_2.1.zip
+  get_url: url={{ chromedriver_url }}
+           dest=/var/tmp/chromedriver_{{ chromedriver_version }}.zip
 
 - name: jenkins_worker | Install ChromeDriver 2
-  shell: unzip /var/tmp/chromedriver_linux64_2.1.zip
+  shell: unzip /var/tmp/chromedriver_{{ chromedriver_version }}.zip
          chdir=/var/tmp
 
 - name: jenkins_worker | Install ChromeDriver 3

playbooks/roles/jenkins_worker/templates/jenkins_env.sh.j2

@@ -4,7 +4,7 @@ export PATH=$RBENV_ROOT/bin/:$PATH
 eval "$(rbenv init -)"
 
 # Configure JavaScript coverage
-export JSCOVER_JAR=/usr/local/bin/JSCover-all.jar
+export JSCOVER_JAR=/usr/local/bin/JSCover-all-{{ jscover_version }}.jar
 
 # Set the display to the virtual frame buffer (Xvfb)
 export DISPLAY=:1