Merge pull request #1124 from AlmaLinux/prod_backport

Backport production changes

Author: anfimovdm

alws/release_planner.py

@@ -669,7 +669,7 @@ async def revert_release_plan(
     @staticmethod
     def get_repo_pretty_name(repo_name: str) -> str:
         regex = re.compile(
-            r"-(i686|x86_64|aarch64|ppc64le|s390x|src)(?P<debug>-debug)?-dr$"
+            r"-([a-z0-9_]+)(?P<debug>-debug)?-dr$"
         )
         pretty_name = regex.sub("", repo_name)
         debug_part = regex.search(repo_name)

alws/routers/build_node.py

@@ -121,6 +121,12 @@ async def get_task(
                     response["platform"].data["mock"][key].update(
                         flavour.data["mock"][key]
                     )
+                if "dnf_common_opts" in flavour.data.get('mock', {}):
+                    if "dnf_common_opts" not in response["platform"].data["mock"]:
+                        response["platform"].data["mock"]["dnf_common_opts"] = []
+                    response["platform"].data["mock"]["dnf_common_opts"].extend(
+                        flavour.data["mock"]["dnf_common_opts"]
+                    )
                 if "definitions" in flavour.data:
                     response["platform"].data["definitions"].update(
                         flavour.data["definitions"]