Merge remote-tracking branch 'origin/sync/zed-into-2023.1' into HEAD

Author: jovial

tools/kolla-images.py

@@ -113,6 +113,12 @@ def parse_args() -> argparse.Namespace:
 
     return parser.parse_args()
 
+def get_distro_regex_map(openstack_release):
+    distro_to_regex = {
+        "rocky": re.compile(f"^{openstack_release}-rocky-9-[\d]{{8}}T[\d]{{6}}$"),
+        "ubuntu": re.compile(f"^{openstack_release}-ubuntu-jammy-[\d]{{8}}T[\d]{{6}}$")
+    }
+    return distro_to_regex
 
 def get_abs_path(relative_path: str) -> str:
     """Return the absolute path of a file in SKC."""
@@ -223,10 +229,7 @@ def validate(kolla_image_tags: KollaImageTags):
     """Validate the kolla_image_tags variable."""
     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}}$")
-        for base_distro in SUPPORTED_BASE_DISTROS
-    }
+    tag_res = get_distro_regex_map(openstack_release)
     errors = []
     if "openstack" not in kolla_image_tags:
         errors.append("Missing default openstack tag")