Firefox: install wrappers in ${buildout:bin-directory} and version up

Slapos compatible wrapper is no longer installed in `parts/firefox/firefox-slapos` , but directly as `firefox` in the `${buildout:bin-directory}` of the software. `geckodriver` is also in the same directory.

Firefox version up to 52.9.0esr

Geckodriver version up to 0.17.0


/reviewed-on nexedi/slapos!387

software/jstestnode/buildout.hash.cfg

+# THIS IS NOT A BUILDOUT FILE, despite purposedly using a compatible syntax.
+# The only allowed lines here are (regexes):
+# - "^#" comments, copied verbatim
+# - "^[" section beginings, copied verbatim
+# - lines containing an "=" sign which must fit in the following categorie.
+#   - "^\s*filename\s*=\s*path\s*$" where "path" is relative to this file
+#     Copied verbatim.
+#   - "^\s*hashtype\s*=.*" where "hashtype" is one of the values supported
+#     by the re-generation script.
+#     Re-generated.
+# - other lines are copied verbatim
+# Substitution (${...:...}), extension ([buildout] extends = ...) and
+# section inheritance (< = ...) are NOT supported (but you should really
+# not need these here).
+
+[instance]
+filename = instance.cfg.in
+md5sum = 7c907db5f803b03a218b49888a3a3799
+
+[template-nginx-service]
+filename = template-nginx-service.sh.in
+md5sum = 529532e1240a66bdf39e3cbbef90ba87
+
+[template-nginx-configuration]
+filename = template-nginx.cfg.in
+md5sum = 9f22db89a2679534aa8fd37dbca86782
+
+[template-runTestSuite]
+filename = runTestSuite.in
+md5sum = af6985e2192b43b5b1dfd37bb538df72

software/jstestnode/runTestSuite.in

@@ -94,8 +94,8 @@ def main():
       firefox_capabilities = webdriver.common.desired_capabilities.DesiredCapabilities.FIREFOX
       firefox_capabilities['marionette'] = True
       browser = webdriver.Firefox(capabilities=firefox_capabilities,
-                                  firefox_binary='${firefox:location}/firefox-slapos',
-                                  executable_path='${firefox:location}/geckodriver')
+                                  firefox_binary='${firefox-wrapper:location}',
+                                  executable_path='${geckodriver:location}')
     elif args.target in ['iOS', 'Android']:
       # parameters for mobile emulators have different names then parameters for
       # desktop OSes

software/jstestnode/software.cfg

@@ -10,6 +10,7 @@ extends =
   ../../component/nginx/buildout.cfg
   ../../component/openssl/buildout.cfg
   ../../component/curl/buildout.cfg
+  ./buildout.hash.cfg
 
 parts =
   slapos-cookbook
@@ -31,13 +32,6 @@ parts =
 [nodejs-output]
 <= nodejs-8.6.0-output
 
-[instance]
-recipe = slapos.recipe.template
-md5sum = 7c907db5f803b03a218b49888a3a3799
-url = ${:_profile_base_location_}/instance.cfg.in
-output = ${buildout:directory}/instance.cfg
-mode = 0644
-
 [eggs]
 recipe = zc.recipe.egg
 eggs =
@@ -98,26 +92,26 @@ stop-on-error = true
 command = cd ${uritemplate-repository.git:location} && PATH=${git:location}/bin/:${nodejs:location}/bin/:$PATH ${nodejs:location}/bin/npm install .
 update-command = ${:command}
 
-[template-nginx-service]
+[macro-template]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/template-nginx-service.sh.in
-md5sum = 529532e1240a66bdf39e3cbbef90ba87
-output = ${buildout:directory}/template-nginx-service.sh.in
+url = ${:_profile_base_location_}/${:filename}
 mode = 0644
 
+[instance]
+<= macro-template
+output = ${buildout:directory}/instance.cfg
+
+[template-nginx-service]
+<= macro-template
+output = ${buildout:directory}/template-nginx-service.sh.in
+
 [template-nginx-configuration]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/template-nginx.cfg.in
-md5sum = 9f22db89a2679534aa8fd37dbca86782
+<= macro-template
 output = ${buildout:directory}/template-nginx.cfg.in
-mode = 0644
 
 [template-runTestSuite]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/runTestSuite.in
-md5sum = 2898d62902351e6df9ce887bd98e2ca1
+<= macro-template
 output = ${buildout:directory}/runTestSuite.in
-mode = 0644
 
 [versions]
 erp5.util = 0.4.51

software/seleniumrunner/buildout.hash.cfg

+# THIS IS NOT A BUILDOUT FILE, despite purposedly using a compatible syntax.
+# The only allowed lines here are (regexes):
+# - "^#" comments, copied verbatim
+# - "^[" section beginings, copied verbatim
+# - lines containing an "=" sign which must fit in the following categorie.
+#   - "^\s*filename\s*=\s*path\s*$" where "path" is relative to this file
+#     Copied verbatim.
+#   - "^\s*hashtype\s*=.*" where "hashtype" is one of the values supported
+#     by the re-generation script.
+#     Re-generated.
+# - other lines are copied verbatim
+# Substitution (${...:...}), extension ([buildout] extends = ...) and
+# section inheritance (< = ...) are NOT supported (but you should really
+# not need these here).
+
+[template]
+filename = instance.cfg.in
+md5sum = c4ac5de141ae6a64848309af03e51d88
+
+[template-selenium]
+filename = instance-selenium.cfg.in
+md5sum = 9b6648b8f37baa3f7a6bfb68d4426049

software/seleniumrunner/instance-selenium.cfg → software/seleniumrunner/instance-selenium.cfg.in

@@ -17,7 +17,7 @@ report-project = $${slap-parameter:report-project}
 [firefox-instance]
 recipe = slapos.cookbook:firefox
 runner-path = $${rootdirectory:bin}/firefox-sandboxed
-firefox-path = ${firefox:location}/firefox-slapos
+firefox-path = ${firefox-wrapper:location}
 prefsjs-path = $${rootdirectory:etc}/prefs.js
 shell-path = ${dash:location}/bin/dash
 tmp-path = $${xvfb-instance:tmp-path}

software/seleniumrunner/software.cfg

@@ -5,6 +5,7 @@ extends =
    ../../component/firefox/buildout.cfg
    ../../component/dash/buildout.cfg
    ../../stack/slapos.cfg
+   ./buildout.hash.cfg
 
 # develop += /opt/slapdev
 
@@ -15,6 +16,7 @@ parts =
    instance-recipe-egg
    xserver
    firefox
+   geckodriver
    xwd
 
 [instance-recipe]
@@ -30,20 +32,19 @@ recipe = zc.recipe.egg
 eggs =
   ${lxml-python:egg}
 
-[template]
-# Default template for the instance.
+
+[macro-template]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance.cfg
-md5sum = c4ac5de141ae6a64848309af03e51d88
-output = ${buildout:directory}/template.cfg
+url = ${:_profile_base_location_}/${:filename}
 mode = 0644
 
+[template]
+<= macro-template
+output = ${buildout:directory}/template.cfg
+
 [template-selenium]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-selenium.cfg
-md5sum = 8be91f4515decef0f8af5910e43e0e52
+<= macro-template
 output = ${buildout:directory}/template-selenium.cfg
-mode = 0644
 
 [versions]
 plone.recipe.command = 1.1