Scale up agent deployments

openshift/deployment-backport-agent-c10s.yml

@@ -4,7 +4,7 @@ metadata:
   name: backport-agent-c10s
 spec:
   progressDeadlineSeconds: 600
-  replicas: 2
+  replicas: 4
   revisionHistoryLimit: 10
   selector:
     matchLabels:
@@ -48,6 +48,7 @@ spec:
           protocol: TCP
         resources:
           limits:
+            cpu: 300m
             memory: 4Gi
           requests:
             memory: 2Gi

openshift/deployment-backport-agent-c9s.yml

@@ -4,7 +4,7 @@ metadata:
   name: backport-agent-c9s
 spec:
   progressDeadlineSeconds: 600
-  replicas: 2
+  replicas: 4
   revisionHistoryLimit: 10
   selector:
     matchLabels:
@@ -48,6 +48,7 @@ spec:
           protocol: TCP
         resources:
           limits:
+            cpu: 300m
             memory: 4Gi
           requests:
             memory: 2Gi

openshift/deployment-mr-consolidation-agent-c10s.yml

@@ -4,7 +4,7 @@ metadata:
   name: mr-consolidation-agent-c10s
 spec:
   progressDeadlineSeconds: 600
-  replicas: 1
+  replicas: 2
   revisionHistoryLimit: 10
   selector:
     matchLabels:
@@ -45,6 +45,7 @@ spec:
           protocol: TCP
         resources:
           limits:
+            cpu: 300m
             memory: 4Gi
           requests:
             memory: 2Gi

openshift/deployment-mr-consolidation-agent-c9s.yml

@@ -4,7 +4,7 @@ metadata:
   name: mr-consolidation-agent-c9s
 spec:
   progressDeadlineSeconds: 600
-  replicas: 1
+  replicas: 2
   revisionHistoryLimit: 10
   selector:
     matchLabels:
@@ -45,6 +45,7 @@ spec:
           protocol: TCP
         resources:
           limits:
+            cpu: 300m
             memory: 4Gi
           requests:
             memory: 2Gi

openshift/deployment-rebase-agent-c10s.yml

@@ -4,7 +4,7 @@ metadata:
   name: rebase-agent-c10s
 spec:
   progressDeadlineSeconds: 600
-  replicas: 1
+  replicas: 2
   revisionHistoryLimit: 10
   selector:
     matchLabels:
@@ -48,6 +48,7 @@ spec:
           protocol: TCP
         resources:
           limits:
+            cpu: 300m
             memory: 3Gi
           requests:
             memory: 1536Mi

openshift/deployment-rebase-agent-c9s.yml

@@ -4,7 +4,7 @@ metadata:
   name: rebase-agent-c9s
 spec:
   progressDeadlineSeconds: 600
-  replicas: 1
+  replicas: 2
   revisionHistoryLimit: 10
   selector:
     matchLabels:
@@ -48,6 +48,7 @@ spec:
           protocol: TCP
         resources:
           limits:
+            cpu: 300m
             memory: 3Gi
           requests:
             memory: 1536Mi

openshift/deployment-rebuild-agent-c10s.yml

@@ -4,7 +4,7 @@ metadata:
   name: rebuild-agent-c10s
 spec:
   progressDeadlineSeconds: 600
-  replicas: 1
+  replicas: 2
   revisionHistoryLimit: 10
   selector:
     matchLabels:
@@ -48,6 +48,7 @@ spec:
           protocol: TCP
         resources:
           limits:
+            cpu: 300m
             memory: 1Gi
           requests:
             memory: 512Mi

openshift/deployment-rebuild-agent-c9s.yml

@@ -4,7 +4,7 @@ metadata:
   name: rebuild-agent-c9s
 spec:
   progressDeadlineSeconds: 600
-  replicas: 1
+  replicas: 2
   revisionHistoryLimit: 10
   selector:
     matchLabels:
@@ -48,6 +48,7 @@ spec:
           protocol: TCP
         resources:
           limits:
+            cpu: 300m
             memory: 1Gi
           requests:
             memory: 512Mi

openshift/deployment-triage-agent.yml

@@ -4,7 +4,7 @@ metadata:
   name: triage-agent
 spec:
   progressDeadlineSeconds: 600
-  replicas: 1
+  replicas: 2
   revisionHistoryLimit: 10
   selector:
     matchLabels:
@@ -47,6 +47,7 @@ spec:
           protocol: TCP
         resources:
           limits:
+            cpu: 300m
             memory: 4Gi
           requests:
             memory: 2Gi

ymir/agents/backport_agent.py

@@ -372,6 +372,7 @@ async def fork_and_prepare_dist_git(state):
                 package=state.package,
                 dist_git_branch=state.dist_git_branch,
                 available_tools=gateway_tools,
+                agent_type="Backport",
                 dist_git_namespace=state.dist_git_namespace,
             )
             local_tool_options["working_directory"] = state.local_clone

ymir/agents/mr_consolidation_agent.py

@@ -515,6 +515,7 @@ async def fork_and_prepare_dist_git(state):
                 package=package,
                 dist_git_branch=dist_git_branch,
                 available_tools=gateway_tools,
+                agent_type="MRConsolidation",
             )
             local_tool_options["working_directory"] = state.local_clone
 

ymir/agents/rebase_agent.py

@@ -197,6 +197,7 @@ async def fork_and_prepare_dist_git(state):
                     package=state.package,
                     dist_git_branch=state.dist_git_branch,
                     available_tools=gateway_tools,
+                    agent_type="Rebase",
                     with_fedora=True,
                     dist_git_namespace=state.dist_git_namespace,
                 )

ymir/agents/rebuild_agent.py

@@ -109,6 +109,7 @@ async def fork_and_prepare_dist_git(state):
                     package=state.package,
                     dist_git_branch=state.dist_git_branch,
                     available_tools=gateway_tools,
+                    agent_type="Rebuild",
                     dist_git_namespace=state.dist_git_namespace,
                 )
                 local_tool_options["working_directory"] = state.local_clone

ymir/agents/tasks.py

@@ -228,12 +228,16 @@ async def fork_and_prepare_dist_git(
     package: str,
     dist_git_branch: str,
     available_tools: list[Tool],
+    agent_type: str,
     with_fedora: bool = False,
     dist_git_namespace: str | None = None,
 ) -> tuple[Path, str, str, Path | None]:
     if not jira_issue or Path(jira_issue).is_absolute() or ".." in jira_issue:
         raise ValueError(f"Invalid jira_issue: {jira_issue}")
-    working_dir = Path(os.environ["GIT_REPO_BASEPATH"]) / jira_issue
+    # Scoped by agent_type so different agent types processing the same
+    # jira_issue concurrently (e.g. rebase and backport) never share a
+    # working directory and can't rm -rf each other's checkout.
+    working_dir = Path(os.environ["GIT_REPO_BASEPATH"]) / agent_type / jira_issue
     if working_dir.is_dir():
         _force_rmtree(working_dir)
     working_dir.mkdir(parents=True, exist_ok=True)

ymir/agents/tests/unit/test_tasks.py

@@ -44,9 +44,10 @@ async def test_fork_and_prepare_dist_git_wipes_stale_working_dir(git_repo_basepa
     jira_issue = "RHEL-12345"
     package = "some-package"
     branch = "rhel-10.0"
+    agent_type = "Rebase"
 
-    working_dir = git_repo_basepath / jira_issue
-    working_dir.mkdir()
+    working_dir = git_repo_basepath / agent_type / jira_issue
+    working_dir.mkdir(parents=True)
     stale_file = working_dir / "leftover-artifact.txt"
     stale_file.write_text("stale")
 
@@ -65,6 +66,7 @@ async def test_fork_and_prepare_dist_git_wipes_stale_working_dir(git_repo_basepa
             package=package,
             dist_git_branch=branch,
             available_tools=mock_tools,
+            agent_type=agent_type,
         )
 
     assert working_dir.is_dir(), "working_dir should be recreated"
@@ -87,6 +89,7 @@ async def test_fork_and_prepare_honors_explicit_centos_stream_namespace(git_repo
             package="squid",
             dist_git_branch="stream-squid-4-rhel-8.10.0",
             available_tools=mock_tools,
+            agent_type="Rebase",
             dist_git_namespace="centos-stream",
         )
 
@@ -113,6 +116,7 @@ async def test_fork_and_prepare_modular_rhel_skips_create_zstream_branch(git_rep
             package="squid",
             dist_git_branch="stream-squid-4-rhel-8.10.0",
             available_tools=mock_tools,
+            agent_type="Rebase",
             dist_git_namespace="rhel",
         )