Merge pull request #1502 from mfalesni/sprout-jenkins

Sprout Jenkins tweaks

fixtures/parallelizer/__init__.py

@@ -144,6 +144,12 @@ def __init__(self, config):
             for appliance_ip in self.appliances:
                 self.terminal.write("- {}\n".format(appliance_ip))
             self._reset_timer()
+            # Set the base_url for collection purposes on the first appliance
+            conf.runtime["env"]["base_url"] = self.appliances[0]
+            # Retrieve and print the template_name for Jenkins to pick up
+            template_name = request["appliances"][0]["template_name"]
+            self.terminal.write("appliance_template={}\n".format(template_name))
+            self.terminal.write("Parallelized Sprout setup finished.\n")
 
     def _reset_timer(self):
         if not (self.sprout_client is not None and self.sprout_pool is not None):

sprout/appliances/api.py

@@ -150,6 +150,7 @@ def request_check(user, request_id):
                 status_changed=apply_if_not_none(appliance.status_changed, "isoformat"),
                 datetime_leased=apply_if_not_none(appliance.datetime_leased, "isoformat"),
                 leased_until=apply_if_not_none(appliance.leased_until, "isoformat"),
+                template_name=appliance.template.original_name,
             )
             for appliance
             in request.appliances