Commit 1634bfaa authored by Roque's avatar Roque Committed by Klaus Wölfel

scalability: destroy old instances before run new tests

parent 14c37de6
...@@ -444,6 +444,9 @@ Require valid-user ...@@ -444,6 +444,9 @@ Require valid-user
supply, supply,
self.reachable_profile, self.reachable_profile,
computer_guid=self.launcher_nodes_computer_guid[0]) computer_guid=self.launcher_nodes_computer_guid[0])
# Delete old instances
logger.info("Destroying old requested instances")
self.slapos_communicator.requestInstanceDestroy(self.instance_title)
# Ask for SR installation # Ask for SR installation
for computer_guid in self.involved_nodes_computer_guid: for computer_guid in self.involved_nodes_computer_guid:
self._prepareSlapOS(self.reachable_profile, computer_guid) self._prepareSlapOS(self.reachable_profile, computer_guid)
...@@ -693,10 +696,6 @@ Require valid-user ...@@ -693,10 +696,6 @@ Require valid-user
error_message = "Error in communication with master: " + str(e) error_message = "Error in communication with master: " + str(e)
break break
# Delete old instances
logger.info("Destroying requested instances")
self.slapos_communicator.requestInstanceDestroy(self.instance_title)
# If error appears then that's a test failure. # If error appears then that's a test failure.
if error_message: if error_message:
logger.info("There was an error during the testsuite run: " + str(error_message)) logger.info("There was an error during the testsuite run: " + str(error_message))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment