caddy-frontend: Control cp runs

software/caddy-frontend/test/test.py

@@ -385,7 +385,8 @@ class SlaveHttpFrontendTestCase(HttpFrontendTestCase):
         partition_parameter_kw=partition_parameter_kw,
         shared=True
       )
-    cls.runComputerPartition()
+    # run partition 4 more times for slaves to be setup
+    cls.runComputerPartition(max_quantity=4)
     for slave_reference, partition_parameter_kw in cls\
             .getSlaveParameterDictDict().items():
       slave_instance = request(

software/caddy-frontend/test/utils.py

@@ -260,7 +260,7 @@ class SlapOSInstanceTestCase(unittest.TestCase):
 
 
   @classmethod
-  def runComputerPartition(cls):
+  def runComputerPartition(cls, max_quantity=None):
     """Instanciate the software.
 
     This is the equivalent of doing:
@@ -272,6 +272,9 @@ class SlapOSInstanceTestCase(unittest.TestCase):
 
     This can be called by tests to simulate re-request with different parameters.
     """
+    run_cp_kw = {}
+    if max_quantity is not None:
+      run_cp_kw['max_quantity'] = max_quantity
     logger = logging.getLogger()
     logger.level = logging.DEBUG
     stream = StringIO.StringIO()
@@ -286,7 +289,8 @@ class SlapOSInstanceTestCase(unittest.TestCase):
       cls.instance_status_dict = cls.slapos_controler.runComputerPartition(
         cls.config,
         cluster_configuration=instance_parameter_dict,
-        environment=os.environ)
+        environment=os.environ,
+        **run_cp_kw)
       stream.seek(0)
       stream.flush()
       message = ''.join(stream.readlines()[-100:])

software/erp5testnode/testsuite/caddy-frontend/software.cfg

@@ -54,8 +54,7 @@ branch = master
 [erp5.util-repository]
 <= git-clone-repository
 repository = https://lab.nexedi.com/nexedi/erp5.git
-revision = 69013fa0fb67501089c776ab5e75d7bbf2e0e3bc
-branch = master
+revision = 55d7381c54a2e90aff2c4a88943883c35ea111de
 
 [configuration]
 test_software_release = ${:_profile_base_location_}/../../../caddy-frontend/software.cfg