Make software/seleniumserver a minimal software again

It's better to make Selenium Server a separate software, seleniumrunner just needs to make firefox available to erp5testnode.

/reviewed-on nexedi/slapos!457

software/erp5testnode/testsuite/seleniumrunner/README.md → software/erp5testnode/testsuite/seleniumserver/README.md

 # Selenium Server test
 
-This software release is simply to run the test suite from `../seleniumrunner/test/setup.py`
+This software release is simply to run the test suite from `../../seleniumserver/test/setup.py`
 
 Nexedi staff can see the results of this test from the test suite
-`SLAPOS-SELENIUMRUNNER-TEST` in test result module.
+`SLAPOS-SELENIUMSERVER-TEST` in test result module.
 

software/erp5testnode/testsuite/seleniumrunner/buildout.hash.cfg → software/erp5testnode/testsuite/seleniumserver/buildout.hash.cfg

@@ -15,5 +15,5 @@
 
 [template]
 filename = instance.cfg.in
-md5sum = 7e75c9eccb580f278da1784941363432
+md5sum = 3019fd19f6623cca92741582b265a1da
 

software/erp5testnode/testsuite/seleniumrunner/instance.cfg.in → software/erp5testnode/testsuite/seleniumserver/instance.cfg.in

@@ -33,7 +33,7 @@ wrapper-path = $${create-directory:bin}/runTestSuite
 command-line =
   ${buildout:bin-directory}/runTestSuite
   --python_interpreter=${buildout:bin-directory}/${eggs:interpreter}
-  --source_code_path_list=$${slapos:location}/software/seleniumrunner/test
+  --source_code_path_list=$${slapos:location}/software/seleniumserver/test
 
 
 # XXX we need "standard" path entries to compile softwares inside test

software/erp5testnode/testsuite/seleniumrunner/software.cfg → software/erp5testnode/testsuite/seleniumserver/software.cfg

@@ -16,10 +16,10 @@ parts =
 [setup-develop-egg]
 recipe = zc.recipe.egg:develop
 
-[slapos.test.seleniumrunner-setup]
+[slapos.test.seleniumserver-setup]
 <= setup-develop-egg
-egg = slapos.test.seleniumrunner
-setup = ${slapos-repository:location}/software/seleniumrunner/test/
+egg = slapos.test.seleniumserver
+setup = ${slapos-repository:location}/software/seleniumserver/test/
 
 [eggs]
 recipe = zc.recipe.egg
@@ -27,7 +27,7 @@ eggs =
   ${pillow-python:egg}
   ${python-pynacl:egg}
   ${bcrypt:egg}
-  ${slapos.test.seleniumrunner-setup:egg}
+  ${slapos.test.seleniumserver-setup:egg}
   slapos.core
 entry-points =
   runTestSuite=erp5.util.testsuite:runTestSuite

software/seleniumrunner/buildout.hash.cfg

@@ -15,8 +15,4 @@
 
 [template]
 filename = instance.cfg.in
-md5sum = c4ac5de141ae6a64848309af03e51d88
-
-[template-selenium]
-filename = instance-selenium.cfg.in
-md5sum = 4167621b473f81892d38389ac427c6ba
+md5sum = 1f31a063c79e19243dcc5508e08a6ae5

software/seleniumrunner/instance.cfg.in

 [buildout]
 parts =
-  switch-softwaretype
+# this sofware has no instance, it's only intended to make programs
+# available for erp5testnode from its software.
 
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
 offline = true
 
-[switch-softwaretype]
-recipe = slapos.cookbook:softwaretype
-default = ${template-selenium:output}
-
-[slap-connection]
-# part to migrate to new - separated words
-computer-id = $${slap_connection:computer_id}
-partition-id = $${slap_connection:partition_id}
-server-url = $${slap_connection:server_url}
-software-release-url = $${slap_connection:software_release_url}
-key-file = $${slap_connection:key_file}
-cert-file = $${slap_connection:cert_file}

software/seleniumrunner/software.cfg

-# Selenium server
-# https://seleniumhq.github.io/docs/grid.html
+# Selenium runner, helper software for erp5testnode.
+#
+# Seleniumrunner responsability is to install a default firefox as ${buildout:bin-directory}/firefox and
+# a geckodriver as ${buildout:bin-directory}/geckodriver for erp5testnode.
 
 [buildout]
 extends =
    ../../component/xorg/buildout.cfg
-   ../../component/lxml-python/buildout.cfg
    ../../component/firefox/buildout.cfg
-   ../../component/chromium/buildout.cfg
-   ../../component/chromedriver/buildout.cfg
    ../../component/coreutils/buildout.cfg
-   ../../component/java/buildout.cfg
-   ../../component/caddy/buildout.cfg
-   ../../component/openssh/buildout.cfg
    ../../stack/slapos.cfg
    ./buildout.hash.cfg
 
@@ -20,19 +16,7 @@ parts =
    template
    firefox-wrapper
    geckodriver
-# seleniumserver needs to install a default firefox as ${buildout:bin-directory}/firefox and
-# a geckodriver as ${buildout:bin-directory}/geckodriver for erp5testnode
 
-[instance-recipe]
-egg = slapos.cookbook
-module = seleniumrunner
-
-[selenium-server]
-recipe = slapos.recipe.build:download
-version = 3.14.0
-md5sum = 376450bd517510442b60018646deadfe
-filename = selenium-server-standalone-${:version}.jar
-url = https://selenium-release.storage.googleapis.com/3.14/${:filename}
 
 [macro-template]
 recipe = slapos.recipe.template
@@ -43,10 +27,6 @@ mode = 0644
 <= macro-template
 output = ${buildout:directory}/template.cfg
 
-[template-selenium]
-<= macro-template
-output = ${buildout:directory}/template-selenium.cfg
-
 [versions]
 plone.recipe.command = 1.1
 slapos.recipe.template = 4.3

software/seleniumrunner/test/README.md

-Tests for SeleniumRunner software release

software/seleniumserver/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 = 4167621b473f81892d38389ac427c6ba

software/seleniumserver/instance.cfg.in

+[buildout]
+parts =
+  switch-softwaretype
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+[switch-softwaretype]
+recipe = slapos.cookbook:softwaretype
+default = ${template-selenium:output}
+
+[slap-connection]
+# part to migrate to new - separated words
+computer-id = $${slap_connection:computer_id}
+partition-id = $${slap_connection:partition_id}
+server-url = $${slap_connection:server_url}
+software-release-url = $${slap_connection:software_release_url}
+key-file = $${slap_connection:key_file}
+cert-file = $${slap_connection:cert_file}

software/seleniumserver/software.cfg

+# Selenium server
+# https://seleniumhq.github.io/docs/grid.html
+
+[buildout]
+extends =
+   ../../component/xorg/buildout.cfg
+   ../../component/lxml-python/buildout.cfg
+   ../../component/firefox/buildout.cfg
+   ../../component/chromium/buildout.cfg
+   ../../component/chromedriver/buildout.cfg
+   ../../component/coreutils/buildout.cfg
+   ../../component/java/buildout.cfg
+   ../../component/caddy/buildout.cfg
+   ../../component/openssh/buildout.cfg
+   ../../stack/slapos.cfg
+   ./buildout.hash.cfg
+
+parts =
+   slapos-cookbook
+   template
+
+[selenium-server]
+recipe = slapos.recipe.build:download
+version = 3.14.0
+md5sum = 376450bd517510442b60018646deadfe
+filename = selenium-server-standalone-${:version}.jar
+url = https://selenium-release.storage.googleapis.com/3.14/${:filename}
+
+[macro-template]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/${:filename}
+mode = 0644
+
+[template]
+<= macro-template
+output = ${buildout:directory}/template.cfg
+
+[template-selenium]
+<= macro-template
+output = ${buildout:directory}/template-selenium.cfg
+
+[versions]
+plone.recipe.command = 1.1
+slapos.recipe.template = 4.3

software/seleniumserver/test/README.md

+Tests for SeleniumServer software release

software/seleniumrunner/test/setup.py → software/seleniumserver/test/setup.py

@@ -27,12 +27,12 @@
 from setuptools import setup, find_packages
 
 version = '0.0.1.dev0'
-name = 'slapos.test.seleniumrunner'
+name = 'slapos.test.seleniumserver'
 long_description = open("README.md").read()
 
 setup(name=name,
       version=version,
-      description="Test for SlapOS' Seleniumrunner",
+      description="Test for SlapOS' Selenium Server",
       long_description=long_description,
       long_description_content_type='text/markdown',
       maintainer="Nexedi",