Fix regexp for required images matching
Change-Id: I699bd497734e945791e0abc01cd0a5a739d72551
This commit is contained in:
parent
d6f8b580e6
commit
de7c9a4fd7
|
@ -54,11 +54,12 @@ def required_images_exists(node_name, underlay, required_images):
|
||||||
images = set([x.strip() for x in result['stdout']])
|
images = set([x.strip() for x in result['stdout']])
|
||||||
LOG.debug('Containers on node "{0}" use images: '
|
LOG.debug('Containers on node "{0}" use images: '
|
||||||
'{1}'.format(node_name, images))
|
'{1}'.format(node_name, images))
|
||||||
# Image name could contain unpredictable Docker registry name
|
# Image name could contain unpredictable Docker registry name (host:port)
|
||||||
# (host:port), e.g. example.net:5000/hyperkube-amd64:v1.4.1
|
# and namespace, e.g. example.net:5000/mirantis/k8s/hyperkube-amd64:v1.4.1
|
||||||
# Use regex to check that image (base name) is used by some container
|
# Use regex to check that image (base name) is used by some container
|
||||||
assert all(
|
assert all(
|
||||||
any(re.match('^([\w.-]+(:\d+)?/)?' # Host:port (optional)
|
any(re.match('^([\w.-]+(:\d+)?/)?' # Host:port (optional)
|
||||||
|
'([\w/]+/)?' # namespace and/or project name (optional)
|
||||||
'{0}:\S+$' # image name + ":" + image tag
|
'{0}:\S+$' # image name + ":" + image tag
|
||||||
.format(required_image), image)
|
.format(required_image), image)
|
||||||
for image in images)
|
for image in images)
|
||||||
|
|
Loading…
Reference in New Issue