vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Set builder hostnames to build UUID

Browse source
This commit is contained in:
Brad Ison 2016-11-15 12:35:48 -08:00
parent e57eece6c1
commit 2c59bd9ee5
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
buildman/manager/executor.py
View file

@ -99,8 +99,9 @@ class BuilderExecutor(object):
none. """ none. """
return self.executor_config.get('MINIMUM_RETRY_THRESHOLD', 0) return self.executor_config.get('MINIMUM_RETRY_THRESHOLD', 0)
def generate_cloud_config(self, realm, token, coreos_channel, manager_hostname, def generate_cloud_config(self, realm, token, build_uuid, coreos_channel,
quay_username=None, quay_password=None): manager_hostname, quay_username=None,
quay_password=None):
if quay_username is None: if quay_username is None:
quay_username = self.executor_config['QUAY_USERNAME'] quay_username = self.executor_config['QUAY_USERNAME']
@ -110,6 +111,7 @@ class BuilderExecutor(object):
return TEMPLATE.render( return TEMPLATE.render(
realm=realm, realm=realm,
token=token, token=token,
build_uuid=build_uuid,
quay_username=quay_username, quay_username=quay_username,
quay_password=quay_password, quay_password=quay_password,
manager_hostname=manager_hostname, manager_hostname=manager_hostname,
@ -160,7 +162,7 @@ class EC2Executor(BuilderExecutor):
get_ami_callable = partial(self._get_coreos_ami, region, channel) get_ami_callable = partial(self._get_coreos_ami, region, channel)
coreos_ami = yield From(self._loop.run_in_executor(None, get_ami_callable)) coreos_ami = yield From(self._loop.run_in_executor(None, get_ami_callable))
user_data = self.generate_cloud_config(realm, token, channel, self.manager_hostname) user_data = self.generate_cloud_config(realm, token, build_uuid, channel, self.manager_hostname)
logger.debug('Generated cloud config for build %s: %s', build_uuid, user_data) logger.debug('Generated cloud config for build %s: %s', build_uuid, user_data)
ec2_conn = self._get_conn() ec2_conn = self._get_conn()
@ -436,7 +438,7 @@ class KubernetesExecutor(BuilderExecutor):
def start_builder(self, realm, token, build_uuid): def start_builder(self, realm, token, build_uuid):
# generate resource # generate resource
channel = self.executor_config.get('COREOS_CHANNEL', 'stable') channel = self.executor_config.get('COREOS_CHANNEL', 'stable')
user_data = self.generate_cloud_config(realm, token, channel, self.manager_hostname) user_data = self.generate_cloud_config(realm, token, build_uuid, channel, self.manager_hostname)
resource = self._job_resource(build_uuid, user_data, channel) resource = self._job_resource(build_uuid, user_data, channel)
logger.debug('Generated kubernetes resource:\n%s', resource) logger.debug('Generated kubernetes resource:\n%s', resource)

2
buildman/templates/cloudconfig.yaml
View file

@ -1,5 +1,7 @@
#cloud-config #cloud-config
hostname: {{ build_uuid | default('quay-builder', True) }}
users: users:
groups: groups:
- sudo - sudo