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

Merge branch 'master' of github.com:coreos-inc/quay

Browse source
This commit is contained in:
Jimmy Zelinskie 2015-02-25 13:56:05 -05:00
commit 328de0201f
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
buildman/manager/executor.py
View file

@ -143,12 +143,18 @@ class EC2Executor(BuilderExecutor):
raise ExecutorException('EC2 started wrong number of instances!') raise ExecutorException('EC2 started wrong number of instances!')
launched = AsyncWrapper(reservation.instances[0]) launched = AsyncWrapper(reservation.instances[0])
yield From(launched.add_tags({
'Name': 'Quay Ephemeral Builder', for i in range(0, 2):
'Realm': realm, try:
'Token': token, yield From(launched.add_tags({
'BuildUUID': build_uuid, 'Name': 'Quay Ephemeral Builder',
})) 'Realm': realm,
'Token': token,
'BuildUUID': build_uuid,
}))
except boto.exception.EC2ResponseError:
logger.exception('Failed to write EC2 tags (attempt #%s)', i)
raise Return(launched.id) raise Return(launched.id)
@coroutine @coroutine