Merge pull request #446 from edx/will/fix-browser-versions

Use debian packages from S3 to fix the browser versions for Chrome and FF

playbooks/roles/browsers/defaults/main.yml

 browser_deb_pkgs:
     - xvfb
-    - firefox
     - dbus-x11
     - libgconf2-4
     - libxss1
     - libnss3-1d
     - libcurl3
     - xdg-utils
-    - google-chrome-stable
+    - gdebi
+
+# Debian packages we host in S3 to ensure correct browser version
+# Both Chrome and FireFox update their apt repos with the latest version,
+# which often causes spurious acceptance test failures.
+browser_s3_deb_pkgs:
+    - { name: "google-chrome-stable_30.0.1599.114-1_amd64.deb", url: "https://s3.amazonaws.com/vagrant.testeng.edx.org/google-chrome-stable_30.0.1599.114-1_amd64.deb" }
+    - { name: "firefox_25.0+build3-0ubuntu0.12.04.1_amd64.deb", url: "https://s3.amazonaws.com/vagrant.testeng.edx.org/firefox_25.0%2Bbuild3-0ubuntu0.12.04.1_amd64.deb" }
 
 # 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.6
 chromedriver_url: "http://chromedriver.storage.googleapis.com/{{ chromedriver_version }}/chromedriver_linux64.zip"
 

playbooks/roles/browsers/tasks/main.yml

 # Install browsers required to run the JavaScript
 # and acceptance test suite locally without a display
 ---
-- name: browsers | Google Chrome apt key
-  apt_key: url={{ chrome_apt_key }} state=present
-
-- name: browsers | Google Chrome apt repo
-  apt_repository: repo='deb {{ chrome_apt_repo }} stable main'
-
 - name: browsers | install system packages
   apt: pkg={{','.join(browser_deb_pkgs)}}
        state=present update_cache=yes
 
+- name: browsers | download browser debian packages from S3
+  get_url: dest="/tmp/{{ item.name }}" url="{{ item.url }}"
+  register: download_deb
+  with_items: "{{ browser_s3_deb_pkgs }}"
+
+- name: browsers | install browser debian packages
+  shell: gdebi -nq /tmp/{{ item.name }}
+  when: download_deb.changed
+  with_items: "{{ browser_s3_deb_pkgs }}"
+
 - name: browsers | Install ChromeDriver
   get_url:
     url={{ chromedriver_url }}