From fc757fecada1c2db0b413bfcd4e87d1e866ee8ba Mon Sep 17 00:00:00 2001
From: Jake Moshenko <jake.moshenko@coreos.com>
Date: Mon, 5 Jan 2015 15:35:14 -0500
Subject: [PATCH] Tag the EC2 instances with the build uuid.
---
buildman/manager/ephemeral.py | 5 +++--
buildman/manager/executor.py | 7 ++++---
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/buildman/manager/ephemeral.py b/buildman/manager/ephemeral.py
index 07c773a59..6abd10a5c 100644
--- a/buildman/manager/ephemeral.py
+++ b/buildman/manager/ephemeral.py
@@ -182,7 +182,8 @@ class EphemeralBuilderManager(BaseManager):
@coroutine
def schedule(self, build_job):
- logger.debug('Calling schedule with job: %s', build_job.job_details['build_uuid'])
+ build_uuid = build_job.job_details['build_uuid']
+ logger.debug('Calling schedule with job: %s', build_uuid)
# Check if there are worker slots avialable by checking the number of jobs in etcd
allowed_worker_count = self._manager_config.get('ALLOWED_WORKER_COUNT', 1)
@@ -223,7 +224,7 @@ class EphemeralBuilderManager(BaseManager):
raise Return(False)
logger.debug('Starting builder with executor: %s', self._executor)
- builder_id = yield From(self._executor.start_builder(realm, token))
+ builder_id = yield From(self._executor.start_builder(realm, token, build_uuid))
# Store the builder in etcd associated with the job id
payload['builder_id'] = builder_id
diff --git a/buildman/manager/executor.py b/buildman/manager/executor.py
index c4b38366d..c122a89fc 100644
--- a/buildman/manager/executor.py
+++ b/buildman/manager/executor.py
@@ -37,7 +37,7 @@ class BuilderExecutor(object):
starting and stopping builders.
"""
@coroutine
- def start_builder(self, realm, token):
+ def start_builder(self, realm, token, build_uuid):
""" Create a builder with the specified config. Returns a unique id which can be used to manage
the builder.
"""
@@ -103,7 +103,7 @@ class EC2Executor(BuilderExecutor):
return stack_amis[ec2_region]
@coroutine
- def start_builder(self, realm, token):
+ def start_builder(self, realm, token, build_uuid):
region = self.executor_config['EC2_REGION']
channel = self.executor_config.get('COREOS_CHANNEL', 'stable')
get_ami_callable = partial(self._get_coreos_ami, region, channel)
@@ -141,6 +141,7 @@ class EC2Executor(BuilderExecutor):
'Name': 'Quay Ephemeral Builder',
'Realm': realm,
'Token': token,
+ 'BuildUUID': build_uuid,
}))
raise Return(launched.id)
@@ -163,7 +164,7 @@ class PopenExecutor(BuilderExecutor):
""" Executor which uses Popen to fork a quay-builder process.
"""
@coroutine
- def start_builder(self, realm, token):
+ def start_builder(self, realm, token, build_uuid):
# Now start a machine for this job, adding the machine id to the etcd information
logger.debug('Forking process for build')
import subprocess