x
/
fuel-ccp-tests
Code Issues Proposed changes

Fix regexp for required images matching 

Change-Id: I699bd497734e945791e0abc01cd0a5a739d72551
This commit is contained in:
Artem Panchenko 2016-11-29 16:02:37 +02:00
parent d6f8b580e6
commit de7c9a4fd7
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fuel_ccp_tests/helpers/post_install_k8s_checks.py
View File

@ -54,11 +54,12 @@ def required_images_exists(node_name, underlay, required_images):
images = set([x.strip() for x in result['stdout']])
LOG.debug('Containers on node "{0}" use images: '
'{1}'.format(node_name, images))
# Image name could contain unpredictable Docker registry name
# (host:port), e.g. example.net:5000/hyperkube-amd64:v1.4.1
# Image name could contain unpredictable Docker registry name (host:port)
# 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
assert all(
any(re.match('^([\w.-]+(:\d+)?/)?' # Host:port (optional)
'([\w/]+/)?' # namespace and/or project name (optional)
'{0}:\S+$' # image name + ":" + image tag
.format(required_image), image)
for image in images)