Commit b1642704 authored by Jérome Perrin's avatar Jérome Perrin

chromium in server

parent c6b76976
...@@ -19,4 +19,4 @@ md5sum = c4ac5de141ae6a64848309af03e51d88 ...@@ -19,4 +19,4 @@ md5sum = c4ac5de141ae6a64848309af03e51d88
[template-selenium] [template-selenium]
filename = instance-selenium.cfg.in filename = instance-selenium.cfg.in
md5sum = 038e124e96aff65a2ee1744db72755ab md5sum = 7a96160536fd41b26d06faf655a11451
...@@ -32,8 +32,7 @@ command-line = ...@@ -32,8 +32,7 @@ command-line =
-host $${:hostname} -host $${:hostname}
-port $${:port} -port $${:port}
-role hub -role hub
-browserTimeout 120 -maxSession 20
-timeout 120
--debug --debug
hostname = $${instance-parameter:ipv4-random} hostname = $${instance-parameter:ipv4-random}
...@@ -59,6 +58,7 @@ command-line = ...@@ -59,6 +58,7 @@ command-line =
-port $${:port} -port $${:port}
-role node -role node
-maxSession 100 -maxSession 100
-timeout 20
-hub $${selenium-server-hub-instance:register-url} -hub $${selenium-server-hub-instance:register-url}
-capabilities $${:capabilities} -capabilities $${:capabilities}
--debug --debug
...@@ -89,6 +89,14 @@ capabilities = browserName=firefox,maxInstances=3,marionette=true,platform=LINUX ...@@ -89,6 +89,14 @@ capabilities = browserName=firefox,maxInstances=3,marionette=true,platform=LINUX
java-args = -Dwebdriver.gecko.driver=${geckodriver-0.21.0:location} java-args = -Dwebdriver.gecko.driver=${geckodriver-0.21.0:location}
port = 7779 port = 7779
[selenium-server-node-instance-chromium-67]
<= selenium-server-node-instance
capabilities = browserName=chrome,maxInstances=3,platform=LINUX,version=${chromium-67:version},chrome_binary=${chromium-wrapper-67:location}/chrome-slapos
java-args = -Dwebdriver.chrome.driver=${chromedriver-2.41:location}
port = 7780
[promises] [promises]
recipe = recipe =
# XXX only enable 51 & 52. They work only one time. We configure maxInstances=3 so practically # XXX only enable 51 & 52. They work only one time. We configure maxInstances=3 so practically
...@@ -102,10 +110,11 @@ recipe = ...@@ -102,10 +110,11 @@ recipe =
instance-promises = instance-promises =
$${selenium-server-hub-listen-promise:path} $${selenium-server-hub-listen-promise:path}
$${selenium-server-node-firefox-51-listen-promise:path}
$${selenium-server-node-firefox-52-listen-promise:path} $${selenium-server-node-firefox-52-listen-promise:path}
$${selenium-server-node-instance-chromium-67-listen-promise:path}
#XXX firefox-60 does not work at all #XXX firefox-60 does not work at all
# $${selenium-server-node-firefox-60-listen-promise:path} # $${selenium-server-node-firefox-60-listen-promise:path}
# $${selenium-server-node-firefox-51-listen-promise:path}
[check-port-listening-promise] [check-port-listening-promise]
...@@ -132,6 +141,12 @@ port = $${selenium-server-node-instance-firefox-52:port} ...@@ -132,6 +141,12 @@ port = $${selenium-server-node-instance-firefox-52:port}
hostname= $${selenium-server-node-instance-firefox-60:hostname} hostname= $${selenium-server-node-instance-firefox-60:hostname}
port = $${selenium-server-node-instance-firefox-60:port} port = $${selenium-server-node-instance-firefox-60:port}
[selenium-server-node-instance-chromium-67-listen-promise]
<= check-port-listening-promise
hostname= $${selenium-server-node-instance-chromium-67:hostname}
port = $${selenium-server-node-instance-chromium-67:port}
[publish-connection-parameter] [publish-connection-parameter]
recipe = slapos.cookbook:publish recipe = slapos.cookbook:publish
url = $${selenium-server-hub-instance:url} url = $${selenium-server-hub-instance:url}
......
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