Skip to content

Commit 86f8e1d

Browse files
author
Jeny Sadadia
committed
Fix filter for getting build nodes
Fix node `state` field in filter for getting build nodes from maestro. Maestro sends all the build nodes to dashboard except running nodes. Fix the filter accordingly. Signed-off-by: Jeny Sadadia <[email protected]>
1 parent 62f3c04 commit 86f8e1d

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

kcidev/subcommands/maestro/validate/helper.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def get_builds(ctx, giturl, branch, commit, arch):
2020
"data.kernel_revision.url=" + giturl,
2121
"data.kernel_revision.branch=" + branch,
2222
"data.kernel_revision.commit=" + commit,
23-
"state__in=done,available",
23+
"state__ne=running",
2424
]
2525
if arch:
2626
filters.append("data.arch=" + arch)
@@ -156,7 +156,8 @@ def extract_validation_data(row: list):
156156
commit = row[1] # Commit hash
157157
comparison = row[4] # Build/boot count comparison (✅ or ❌)
158158
missing_ids = row[5] # Missing build/boot IDs
159-
return tree_branch, commit, comparison, missing_ids
159+
mismatched_ids = row[6]
160+
return tree_branch, commit, comparison, missing_ids, mismatched_ids
160161
except IndexError:
161162
kci_msg_red("Failed to extract data for list view report")
162163
raise ValueError()
@@ -173,7 +174,7 @@ def print_simple_list(data, item_type, history=False):
173174

174175
for row in data:
175176
try:
176-
tree_branch, commit, comparison, missing_ids = extract_validation_data(
177+
tree_branch, commit, comparison, missing_ids, _ = extract_validation_data(
177178
row
178179
)
179180
except ValueError:
@@ -197,7 +198,7 @@ def print_simple_list(data, item_type, history=False):
197198
# For non-history mode, show each individual result
198199
for row in data:
199200
try:
200-
tree_branch, commit, comparison, missing_ids = extract_validation_data(
201+
tree_branch, commit, comparison, missing_ids, mismatched_ids = extract_validation_data(
201202
row
202203
)
203204
except ValueError:
@@ -212,6 +213,8 @@ def print_simple_list(data, item_type, history=False):
212213
kci_msg(f" - https://api.kernelci.org/viewer?node_id={id}")
213214
elif comparison == "❌":
214215
kci_msg(f" Has mismatch but no missing IDs listed")
216+
for id in mismatched_ids:
217+
kci_msg(f" - https://api.kernelci.org/viewer?node_id={id}")
215218
kci_msg("")
216219

217220

@@ -385,7 +388,7 @@ def get_builds_history(ctx, checkouts, arch):
385388
"kind=kbuild",
386389
"data.error_code__ne=node_timeout",
387390
"parent=" + c["id"],
388-
"state__in=done,available",
391+
"state__ne=running",
389392
]
390393
if arch:
391394
filters.append(f"data.arch={arch}")

0 commit comments

Comments
 (0)