Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
configuration
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
configuration
Commits
e04a7e7c
Commit
e04a7e7c
authored
8 years ago
by
stu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update chrome, chromedriver and use systemd script for xvfb
parent
18ee4aed
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
48 additions
and
6 deletions
+48
-6
playbooks/roles/browsers/defaults/main.yml
+3
-3
playbooks/roles/browsers/tasks/main.yml
+36
-3
playbooks/roles/browsers/templates/xvfb.service.j2
+9
-0
No files found.
playbooks/roles/browsers/defaults/main.yml
View file @
e04a7e7c
...
@@ -12,11 +12,11 @@ browser_deb_pkgs:
...
@@ -12,11 +12,11 @@ browser_deb_pkgs:
# Both Chrome and FireFox update their apt repos with the latest version,
# Both Chrome and FireFox update their apt repos with the latest version,
# which often causes spurious acceptance test failures.
# which often causes spurious acceptance test failures.
browser_s3_deb_pkgs
:
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
:
"
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 Chrome
Driver
# ChromeDriver
chromedriver_version
:
2.
6
chromedriver_version
:
2.
27
chromedriver_url
:
"
http://chromedriver.storage.googleapis.com/{{
chromedriver_version
}}/chromedriver_linux64.zip"
chromedriver_url
:
"
http://chromedriver.storage.googleapis.com/{{
chromedriver_version
}}/chromedriver_linux64.zip"
# PhantomJS
# PhantomJS
...
...
This diff is collapsed.
Click to expand it.
playbooks/roles/browsers/tasks/main.yml
View file @
e04a7e7c
...
@@ -71,9 +71,42 @@
...
@@ -71,9 +71,42 @@
-
assert
:
-
assert
:
that
:
"
phantomjs.stat.exists"
that
:
"
phantomjs.stat.exists"
-
name
:
create xvfb upstart script
-
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
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
shell
:
start xvfb
ignore_errors
:
yes
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
This diff is collapsed.
Click to expand it.
playbooks/roles/browsers/templates/xvfb.service.j2
0 → 100644
View file @
e04a7e7c
[Unit]
Description=Xvfb X Server
After=network.target
[Service]
ExecStart=/usr/bin/Xvfb {{ browser_xvfb_display }} -screen 0 1024x768x24
[Install]
WantedBy=multi-user.target
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment