resiliencetest: Verbose log between the interactions to know if the software...

resiliencetest: Verbose log between the interactions to know if the software is working for failing.

slapos/resiliencytest/suites/erp5.py

@@ -189,7 +189,6 @@ class ERP5TestSuite(SlaprunnerTestSuite):
     Wait for instance to be started.
     Store the main IP of the slaprunner for future use.
     """
-
     self.logger.debug('Getting the backend URL...')
     parameter_dict = self._getPartitionParameterDict()
     self.slaprunner_backend_url = parameter_dict['backend-url']
@@ -204,9 +203,6 @@ class ERP5TestSuite(SlaprunnerTestSuite):
     self._openSoftwareRelease('erp5')
     self._setERP5InstanceParameter()
 
-    # Debug, remove me.
-    time.sleep(600)
-
     self._buildSoftwareRelease()
     self._deployInstance()
     self._deployInstance()

slapos/resiliencytest/suites/slaprunner.py

@@ -128,6 +128,19 @@ class SlaprunnerTestSuite(ResiliencyTestSuite):
           )
     return data
 
+  def _retrieveSoftwareLogFileTail(self, truncate=100):
+    """
+      Retrieve the tail of the software.log file.
+    """
+    data = self._connectToSlaprunner(
+             resource='getFileLog',
+             data="filename=software.log&truncate=%s" % truncate)
+    try:
+      data = json.loads(data)['result']
+      self.logger.info('Tail of software.log:\n%s' % data)
+    except (ValueError, KeyError):
+      self.logger.info("Fail to get software.log")
+
 
   def _waitForSoftwareBuild(self, limit=5000):
     """
@@ -152,7 +165,10 @@ class SlaprunnerTestSuite(ResiliencyTestSuite):
         self.logger.info('Software release is Failing to Build. Sleeping...')
       else:
         self.logger.info('Software release is still building. Sleeping...')
-      time.sleep(60)
+      time.sleep(20)
+      for sleep_wait in range(3):
+        self._retrieveSoftwareLogFileTail(truncate=100)
+        time.sleep(10)
 
 
   def _buildSoftwareRelease(self):