software/seleniumrunner: Add a selenium server service

software/seleniumrunner/buildout.hash.cfg

@@ -19,4 +19,4 @@ md5sum = c4ac5de141ae6a64848309af03e51d88
 
 [template-selenium]
 filename = instance-selenium.cfg.in
-md5sum = e30b1738099bf80c44d003ea57f709b4
+md5sum = cf4a26cc898888999481e3ada51f8f97

software/seleniumrunner/instance-selenium.cfg.in

 [buildout]
 parts =
-  selenium-instance
+  promises
+  publish-connection-parameter
 
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory} 
 offline = true
 
-[selenium-instance]
-recipe = slapos.cookbook:seleniumrunner
-runner-path = $${basedirectory:services}/selenium-runner
-browser = $${firefox-instance:runner-path}
-suite-url = $${slap-parameter:suite-url}
-report-url = $${slap-parameter:report-url}
-report-project = $${slap-parameter:report-project}
-
-[firefox-instance]
-recipe = slapos.cookbook:firefox
-runner-path = $${rootdirectory:bin}/firefox-sandboxed
-firefox-path = ${firefox:location}
-prefsjs-path = $${rootdirectory:etc}/prefs.js
-shell-path = ${dash:location}/bin/dash
-tmp-path = $${xvfb-instance:tmp-path}
+
+[selenium-server-instance]
+recipe = slapos.cookbook:wrapper
+wrapper-path = $${basedirectory:services}/$${:_buildout_section_name_}
+command-line =
+  ${java-re-8:location}/bin/java
+    -jar ${selenium-server:destination}
+    -host $${:hostname}
+    -port $${:port}
+# browsers and driver are all in buildout bin-directory
+environment =
+  PATH=${buildout:bin-directory}
+  DISPLAY=$${xvfb-instance:display}
+hostname = $${instance-parameter:ipv4-random}
+port = 4444
+url = http://$${:hostname}:$${:port}/wd/hub
 
 [xvfb-instance]
-recipe = slapos.cookbook:xvfb
-runner-path = $${basedirectory:services}/xvfb
-xvfb-path = ${xserver:location}/bin/Xvfb
-fbdir-path = $${basedirectory:framebuffer}
-tmp-path = $${basedirectory:run}
-shell-path = ${dash:location}/bin/dash
+recipe = slapos.cookbook:wrapper
+wrapper-path = $${basedirectory:services}/$${:_buildout_section_name_}
+command-line =
+  ${xserver:location}/bin/Xvfb
+    -screen 0 1024x768x24
+    -fbdir $${basedirectory:framebuffer}
+    $${:display}
+display = :123
+
+
+[promises]
+recipe =
+instance-promises =
+  $${selenium-server-listen-promise:path}
+
+[check-port-listening-promise]
+recipe = slapos.cookbook:check_port_listening
+path = $${basedirectory:promises}/$${:_buildout_section_name_}
 
-xwd-path = ${xwd:location}/bin/xwd
-xwd-hook-path = $${rootdirectory:bin}/xwd
+[selenium-server-listen-promise]
+<= check-port-listening-promise
+hostname= $${selenium-server-instance:hostname}
+port = $${selenium-server-instance:port}
+
+
+[publish-connection-parameter]
+recipe = slapos.cookbook:publish
+url = $${selenium-server-instance:url}
+display = $${xvfb-instance:display}
+
+[instance-parameter]
+recipe = slapos.cookbook:slapconfiguration
+computer = $${slap-connection:computer-id}
+partition = $${slap-connection:partition-id}
+url = $${slap-connection:server-url}
+key = $${slap-connection:key-file}
+cert = $${slap-connection:cert-file}
 
 [rootdirectory]
 recipe = slapos.cookbook:mkdirectory
@@ -42,6 +72,8 @@ bin = $${buildout:directory}/bin
 
 [basedirectory]
 recipe = slapos.cookbook:mkdirectory
-services = $${rootdirectory:etc}/run
+services = $${rootdirectory:etc}/service
 run = $${rootdirectory:var}/run
 framebuffer = $${rootdirectory:srv}/framebuffer
+promises = $${rootdirectory:etc}/promise
+

software/seleniumrunner/software.cfg

@@ -4,6 +4,7 @@ extends =
    ../../component/lxml-python/buildout.cfg
    ../../component/firefox/buildout.cfg
    ../../component/dash/buildout.cfg
+   ../../component/java/buildout.cfg
    ../../stack/slapos.cfg
    ./buildout.hash.cfg
 
@@ -18,6 +19,7 @@ parts =
    firefox
    geckodriver
    xwd
+   selenium-server
 
 [instance-recipe]
 egg = slapos.cookbook
@@ -32,6 +34,13 @@ recipe = zc.recipe.egg
 eggs =
   ${lxml-python:egg}
 
+[selenium-server]
+recipe = slapos.recipe.build:download
+version = 3.14.0
+md5sum = 376450bd517510442b60018646deadfe
+jar = selenium-server-standalone-${:version}.jar
+url = https://selenium-release.storage.googleapis.com/3.14/${:jar}
+destination = ${buildout:parts-directory}/${:_buildout_section_name_}/${:jar}
 
 [macro-template]
 recipe = slapos.recipe.template