Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tools/kolla-images.py
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ def validate(kolla_image_tags: KollaImageTags):
tag_var_re = re.compile(r"^[a-z0-9_]+$")
openstack_release = get_openstack_release()
tag_res = {
base_distro: re.compile(f"^{openstack_release}-{base_distro}-[\d]{{8}}T[\d]{{6}}$")
base_distro: re.compile(rf"^{openstack_release}-{base_distro}-[\d]{{8}}T[\d]{{6}}$")
for base_distro in SUPPORTED_BASE_DISTROS
}
errors = []
Expand Down Expand Up @@ -308,7 +308,7 @@ def check_image_map(kolla_ansible_path: str):
image_map = yaml.safe_load(image_map_str)
image_var_re = re.compile(r"^([a-z0-9_]+)_image$")
image_map = {
image_var_re.match(image_var).group(1): image.split("/")[-1]
image_var_re.match(image_var).group(1): image.split("/")[-1].replace('{{ docker_image_name_prefix }}', '')
for image_var, image in image_map.items()
}
# Filter out unsupported images.
Expand Down
Loading