Allow two concurrent tasks on workers

openshift/configmap-agents-env.yml

@@ -1,7 +1,7 @@
 apiVersion: v1
 data:
   MAX_RETRIES: "3"
-  MAX_CONCURRENT_TASKS: "1"
+  MAX_CONCURRENT_TASKS: "2"
   LOG_BUFFER_SIZE: "0"
   GIT_REPO_BASEPATH: /git-repos
   # The maximum number of retries for a single step in the agent execution.

ymir/agents/merge_request_agent.py

@@ -116,8 +116,6 @@ async def main() -> None:
     dry_run = os.getenv("DRY_RUN", "False").lower() == "true"
     max_build_attempts = int(os.getenv("MAX_BUILD_ATTEMPTS", "10"))
 
-    local_tool_options = {"working_directory": None}
-
     class State(BaseModel):
         merge_request_url: str
         local_clone: Path | None = Field(default=None)
@@ -137,7 +135,7 @@ class State(BaseModel):
         all_files_git_to_add: set[str] = Field(default_factory=set)
 
     async def run_workflow(merge_request_url):
-        local_tool_options["working_directory"] = None
+        local_tool_options = {"working_directory": None}
 
         async with mcp_tools(os.environ["MCP_GATEWAY_URL"]) as gateway_tools:
             merge_request_agent = create_merge_request_agent(gateway_tools, local_tool_options)

ymir/agents/rebase_agent.py

@@ -127,8 +127,6 @@ async def main() -> None:
     dry_run = os.getenv("DRY_RUN", "False").lower() == "true"
     max_build_attempts = int(os.getenv("MAX_BUILD_ATTEMPTS", "10"))
 
-    local_tool_options: dict[str, Any] = {"working_directory": None}
-
     class State(PackageUpdateState):
         version: str
         justification: str | None = Field(default=None)
@@ -150,7 +148,7 @@ async def run_workflow(
         redis_conn=None,
         user_triggered=False,
     ):
-        local_tool_options["working_directory"] = None
+        local_tool_options: dict[str, Any] = {"working_directory": None}
         if mock_env := get_mock_local_tool_env(jira_issue):
             local_tool_options["env"] = mock_env
 

ymir/agents/rebuild_agent.py

@@ -52,8 +52,6 @@ async def main() -> None:
 
     dry_run = os.getenv("DRY_RUN", "False").lower() == "true"
 
-    local_tool_options = {"working_directory": None}
-
     class State(PackageUpdateState):
         rebuild_success: bool = Field(default=False)
         rebuild_error: str | None = Field(default=None)
@@ -78,7 +76,7 @@ async def run_workflow(
         side_tag=None,
         user_triggered=False,
     ):
-        local_tool_options["working_directory"] = None
+        local_tool_options = {"working_directory": None}
         if mock_env := get_mock_local_tool_env(jira_issue):
             local_tool_options["env"] = mock_env
 

ymir/agents/tasks.py

@@ -113,7 +113,7 @@ async def prepare_dist_git_from_merge_request(
     fedora_clone = None
     if with_fedora:
         package = details.target_repo_name
-        fedora_clone = working_dir / f"{package}-fedora"
+        fedora_clone = working_dir / f"{package}-fedora-{local_clone.name}"
         if not await _clone_fedora_dist_git(package, fedora_clone):
             fedora_clone = None
     return local_clone, details, fedora_clone