openstack/kolla-ansible
Code Issues Proposed changes

Build.py regex filtering

Browse Source 
Adds option to build.py to only build images matching and its
dependencies

Change-Id: I281bea5bed932b7c948b247392fa6a52b1d1aecf
This commit is contained in:
Michal Jastrzebski (inc0) 2015-08-24 13:31:26 +02:00
parent 44aa4af5f5
commit 48c0ecf546
1 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
tools/build.py
View File

@ -22,6 +22,7 @@ import json
import logging import logging
import os import os
import Queue import Queue
import re
import requests import requests
import shutil import shutil
import signal import signal
@ -125,6 +126,10 @@ class WorkerThread(Thread):
def argParser(): def argParser():
parser = argparse.ArgumentParser(description='Kolla build script') parser = argparse.ArgumentParser(description='Kolla build script')
parser.add_argument('regex',
help=('Build only images matching '
'regex and its dependencies'),
nargs='*')
parser.add_argument('-n', '--namespace', parser.add_argument('-n', '--namespace',
help='Set the Docker namespace name', help='Set the Docker namespace name',
type=str, type=str,
@ -197,9 +202,11 @@ class KollaWorker(object):
self.config = ConfigParser.SafeConfigParser() self.config = ConfigParser.SafeConfigParser()
self.config.read(os.path.join(sys.path[0], '..', 'build.ini')) self.config.read(os.path.join(sys.path[0], '..', 'build.ini'))
self.include_header = args['include_header'] self.include_header = args['include_header']
self.regex = args['regex']
self.image_statuses_bad = {} self.image_statuses_bad = {}
self.image_statuses_good = {} self.image_statuses_good = {}
self.image_statuses_unproc = {}
def setupWorkingDir(self): def setupWorkingDir(self):
"""Creates a working directory for use while building""" """Creates a working directory for use while building"""
@ -262,7 +269,23 @@ class KollaWorker(object):
def sortImages(self): def sortImages(self):
"""Build images dependency tiers""" """Build images dependency tiers"""
images_to_process = list(self.images) if self.regex:
patterns = re.compile(r'({})'.format("|".join(self.regex)))
images_to_process = list()
for image in self.images:
if re.search(patterns, image['fullname']):
images_to_process.append(image)
added = True
while added:
added = False
parents = [p['parent'] for p in images_to_process]
for image in self.images:
if (image['fullname'] in parents and
image not in images_to_process):
images_to_process.append(image)
added = True
else:
images_to_process = self.images
self.tiers = list() self.tiers = list()
while images_to_process: while images_to_process:
@ -303,13 +326,18 @@ class KollaWorker(object):
LOG.info("Successfully built images") LOG.info("Successfully built images")
LOG.info("=========================") LOG.info("=========================")
for name in self.image_statuses_good.keys(): for name in self.image_statuses_good.keys():
LOG.info(name) LOG.info(name)
LOG.info("Images that failed to build") LOG.info("Images that failed to build")
LOG.info("===========================") LOG.info("===========================")
for name, status in self.image_statuses_bad.iteritems(): for name, status in self.image_statuses_bad.iteritems():
LOG.error('{}\r\t\t\t Failed with status: {}'.format( LOG.error('{}\r\t\t\t Failed with status: {}'.format(
name, status)) name, status))
LOG.debug("Not processed images")
LOG.debug("=========================")
for name in self.image_statuses_unproc.keys():
LOG.debug(name)
def get_image_statuses(self): def get_image_statuses(self):
if len(self.image_statuses_bad) or len(self.image_statuses_good): if len(self.image_statuses_bad) or len(self.image_statuses_good):
@ -317,6 +345,8 @@ class KollaWorker(object):
for image in self.images: for image in self.images:
if image['status'] == "built": if image['status'] == "built":
self.image_statuses_good[image['name']] = image['status'] self.image_statuses_good[image['name']] = image['status']
elif image['status'] == "unprocessed":
self.image_statuses_unproc[image['name']] = image['status']
else: else:
self.image_statuses_bad[image['name']] = image['status'] self.image_statuses_bad[image['name']] = image['status']
return (self.image_statuses_bad, self.image_statuses_good) return (self.image_statuses_bad, self.image_statuses_good)