From 1242ae2060502bdd4b2cd9b0db90d4d2c50bc7c5 Mon Sep 17 00:00:00 2001 From: Alex-Welsh Date: Tue, 18 Feb 2025 13:24:28 +0000 Subject: [PATCH] Fix kolla-images.py for latest Kolla Ansible Kolla image names have recently been updated to include a prefix, docker_image_name_prefix. This change updates the kolla-images.py script to compensate. --- tools/kolla-images.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/kolla-images.py b/tools/kolla-images.py index 82ded3f81..31259ebf1 100755 --- a/tools/kolla-images.py +++ b/tools/kolla-images.py @@ -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 = [] @@ -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.