Commit e04a7e7c by stu

update chrome, chromedriver and use systemd script for xvfb

parent 18ee4aed
......@@ -12,11 +12,11 @@ browser_deb_pkgs:
# 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-mozilla-build_42.0-0ubuntu1_amd64.deb", url: "https://s3.amazonaws.com/vagrant.testeng.edx.org/firefox-mozilla-build_42.0-0ubuntu1_amd64.deb" }
- { name: "google-chrome-stable_55.0.2883.87-1_amd64.deb", url: "https://s3.amazonaws.com/vagrant.testeng.edx.org/google-chrome-stable_55.0.2883.87-1_amd64.deb" }
# Chrome and ChromeDriver
chromedriver_version: 2.6
# ChromeDriver
chromedriver_version: 2.27
chromedriver_url: "http://chromedriver.storage.googleapis.com/{{ chromedriver_version }}/chromedriver_linux64.zip"
# PhantomJS
......
......@@ -71,9 +71,42 @@
- assert:
that: "phantomjs.stat.exists"
- name: create xvfb upstart script
template: src=xvfb.conf.j2 dest=/etc/init/xvfb.conf owner=root group=root
- name: create xvfb upstart script for Precise and Trusty (12.04 and 14.04)
template:
src: xvfb.conf.j2
dest: /etc/init/xvfb.conf
owner: root
group: root
when: ansible_distribution_release == 'precise' or ansible_distribution_release == 'trusty'
tags:
- install
- install:configuration
- name: start xvfb
- name: start xvfb upstart script for Precise and Trusty (12.04 and 14.04)
shell: start xvfb
ignore_errors: yes
when: ansible_distribution_release == 'precise' or ansible_distribution_release == 'trusty'
tags:
- install
- install:configuration
- name: create xvfb systemd service for Xenial (16.04)
template:
src: xvfb.service.j2
dest: /etc/systemd/system/xvfb.service
owner: root
group: root
when: ansible_distribution_release == 'xenial'
tags:
- install
- install:configuration
- name: enable and start xvfb systemd service for Xenial (16.04)
systemd:
name: xvfb
enabled: yes
state: started
when: ansible_distribution_release == 'xenial'
tags:
- install
- install:configuration
[Unit]
Description=Xvfb X Server
After=network.target
[Service]
ExecStart=/usr/bin/Xvfb {{ browser_xvfb_display }} -screen 0 1024x768x24
[Install]
WantedBy=multi-user.target
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment