Skip to content

Fix checkout tree check #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nuclearcat merged 1 commit into from
Oct 16, 2025
Merged

Fix checkout tree check #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 27 additions & 8 deletions orchestrator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,19 +536,38 @@ async def process_checkout_wait_step(
# KernelCI API returns nodes in "items" array, not "data"
nodes = data.get("items", [])

# Look for a node with submitter: "service:pipeline" and matching tree
# Look for a node with submitter: "service:pipeline"
print(
f"DEBUG: Found {len(nodes)} checkout nodes, searching for tree: {staging_run.kernel_tree}"
)
for node in nodes:
if node.get("submitter") == "service:pipeline":
data_obj = node.get("data", {})
kernel_revision = data_obj.get("kernel_revision", {})
tree = kernel_revision.get("tree")

# Check if tree matches the kernel_tree from staging_run
# For "auto" we need to match the actual selected tree
if tree == staging_run.kernel_tree or (
staging_run.kernel_tree == "auto"
and tree in ["next", "mainline", "stable"]
):
branch = kernel_revision.get("branch")

print(
f"DEBUG: Checking node - tree: {tree}, branch: {branch}, submitter: {node.get('submitter')}"
)

# TODO: Improve tree/branch matching logic
# The current implementation doesn't properly match tree names.
# Based on KernelCI API response, nodes have:
# - tree: "kernelci", branch: "staging-mainline" (for mainline)
# - tree: "kernelci", branch: "staging-stable" (for stable)
# - tree: "kernelci", branch: "staging-next" (for next)
# We should match based on branch name containing the selected tree
# For now, just match any node with submitter: "service:pipeline"

# Commented out old tree matching logic:
# if tree == staging_run.kernel_tree or (
# staging_run.kernel_tree == "auto"
# and tree in ["next", "mainline", "stable"]
# ):

# Temporary: Accept any service:pipeline checkout node
if True:
# Found matching checkout node!
treeid = node.get("id")
if treeid:
Expand Down