openstack/kolla-ansible
Code Issues Proposed changes

Merge "Improve build.py"

Browse Source
This commit is contained in:
Jenkins 2015-07-15 11:20:54 +00:00 committed by Gerrit Code Review
commit 1699910851
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tools/build.py
View File

@ -37,11 +37,11 @@ import docker
class WorkerThread(Thread): class WorkerThread(Thread):
def __init__(self, queue, cache, rm): def __init__(self, queue, nocache, keep):
self.queue = queue self.queue = queue
self.nocache = not cache self.nocache = nocache
self.forcerm = rm self.forcerm = not keep
self.dc = docker.Client() self.dc = docker.Client(**docker.utils.kwargs_from_env())
Thread.__init__(self) Thread.__init__(self)
def run(self): def run(self):
@ -85,7 +85,7 @@ class WorkerThread(Thread):
raise Exception(stream['errorDetail']['message']) raise Exception(stream['errorDetail']['message'])
image['status'] = "built" image['status'] = "built"
print(image['logs'], '\nProcessed:', image['name']) print(image['logs'], 'Processed:', image['name'])
def argParser(): def argParser():
@ -106,14 +106,14 @@ def argParser():
help='The method of the Openstack install', help='The method of the Openstack install',
type=str, type=str,
default='binary') default='binary')
parser.add_argument('-c', '--cache', parser.add_argument('--no-cache',
help='Use Docker cache when building', help='Do not use the Docker cache when building',
type=bool, action='store_true',
default=True) default=False)
parser.add_argument('-r', '--rm', parser.add_argument('--keep',
help='Remove intermediate containers while building', help='Keep failed intermediate containers building',
type=bool, action='store_true',
default=True) default=False)
parser.add_argument('-T', '--threads', parser.add_argument('-T', '--threads',
help='The number of threads to use while building', help='The number of threads to use while building',
type=int, type=int,
@ -258,7 +258,7 @@ def main():
# Returns a list of Queues for us to loop through # Returns a list of Queues for us to loop through
for pool in kolla.buildQueues(): for pool in kolla.buildQueues():
for x in xrange(args['threads']): for x in xrange(args['threads']):
WorkerThread(pool, args['cache'], args['rm']).start() WorkerThread(pool, args['no_cache'], args['keep']).start()
# block until queue is empty # block until queue is empty
pool.join() pool.join()