Skip to content

Contest: prepare HW split #100

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
kuba-moo merged 7 commits into from
Sep 19, 2026
Merged

Contest: prepare HW split #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
23e3fae
contest: pw: config to change PW's check name
matttbe Sep 10, 2026
bdee80c
brancher: write info file atomically
matttbe Sep 10, 2026
4e2d8ac
contest: collector: skip results not linked to a recent branch
matttbe Sep 11, 2026
9acb9d6
ui: status: open HW branch results
matttbe Sep 11, 2026
00aee14
ui: status: extract base-pulls info at loading time
matttbe Sep 18, 2026
04ec666
ui: status: open individual branches info
matttbe Sep 18, 2026
09f7a7e
ui: results: identify the brancher from the executor name
matttbe Sep 18, 2026
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
5 changes: 3 additions & 2 deletions contest/results-collector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,9 +494,10 @@ def build_combined(fetcher, remote_db):
report_broken_remote(remote, error)

for entry in results:
if entry['branch'] not in branch_info:
continue

if not entry['url']: # Executor is running
if entry['branch'] not in branch_info:
continue
data = entry.copy()
when = datetime.datetime.fromisoformat(branch_info[entry['branch']]['date'])
data["start"] = str(when)
Expand Down
5 changes: 1 addition & 4 deletions pw_brancher.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,10 +391,7 @@ def dump_branches(config, state) -> None:
"url": pub_url + " " + name})

write_json_atomic(config.get("output", "branches"), data)

info = config.get("output", "info")
with open(info, 'w') as fp:
json.dump(state["info"], fp)
write_json_atomic(config.get("output", "info"), state["info"])
Comment thread
matttbe marked this conversation as resolved.
log_end_sec()


Expand Down
19 changes: 11 additions & 8 deletions pw_contest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
patch_state=state.json
[www]
contest=https://server-with-ui/contest.html
[patchwork]
check_name=contest
"""

class Codes:
Expand Down Expand Up @@ -223,16 +225,16 @@ def skip_update(outcome) -> bool:
return False


def update_one(pw, patch_id, outcome, link):
def update_one(pw, patch_id, outcome, link, check_name):
description = outcome['branch']
if outcome["code"] >= 0:
description += f' (tests: {outcome["cnt"]})'
url = link + '?pw-n=0&branch=' + outcome['branch']
pw.post_check(patch_id, name="contest", state=code_to_pw[outcome["code"]],
pw.post_check(patch_id, name=check_name, state=code_to_pw[outcome["code"]],
url=url, desc=description)


def _patch_state_update(pw, state: dict, link: str):
def _patch_state_update(pw, state: dict, link: str, check_name: str):
update_cnt = 0
for series_id, outcome in state["series"].items():
if skip_update(outcome):
Expand All @@ -242,7 +244,7 @@ def _patch_state_update(pw, state: dict, link: str):
log_open_sec('Updating series ' + series_id)
series_pw = pw.get("series", series_id)
for patch in series_pw["patches"]:
update_one(pw, patch["id"], outcome, link)
update_one(pw, patch["id"], outcome, link, check_name)
update_cnt += 1

del outcome["update"]
Expand All @@ -255,7 +257,7 @@ def _patch_state_update(pw, state: dict, link: str):

try:
log_open_sec('Updating PR ' + pr_id)
update_one(pw, pr_id, outcome, link)
update_one(pw, pr_id, outcome, link, check_name)
update_cnt += 1

del outcome["update"]
Expand All @@ -265,10 +267,10 @@ def _patch_state_update(pw, state: dict, link: str):
print("Updated", update_cnt, "pw things")


def patch_state_update(pw, state: dict, link: str):
def patch_state_update(pw, state: dict, link: str, check_name: str):
log_open_sec('Updating patch states')
try:
_patch_state_update(pw, state, link)
_patch_state_update(pw, state, link, check_name)
finally:
log_end_sec()

Expand All @@ -291,7 +293,8 @@ def main_loop(pw) -> int:
results_by_branch = results_pivot(filters, results)
branch_outcome = branch_summarize(filters, results_by_branch)
patch_state_compute(patch_state, branches, branch_outcome)
patch_state_update(pw, patch_state, config.get('www', 'contest'))
patch_state_update(pw, patch_state, config.get('www', 'contest'),
config.get('patchwork', 'check_name', fallback='contest'))

rbb = config.get('output', 'results_by_branch', fallback=None)
if rbb:
Expand Down
4 changes: 3 additions & 1 deletion scripts/ui_assets.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ ASSETS=(
"status.json"
"issues.json"
"contest/branch-results.json"
"contest/branches-info.json"
"contest/branch-results-hw.json"
"contest/branches-info-nn.json"
"contest/branches-info-hw.json"
"contest/filters.json"
"contest/all-results.json"
)
Expand Down
2 changes: 1 addition & 1 deletion ui/contest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ function load_result_table(data_raw)
function find_branch_urls(loaded_data)
{
$.each(loaded_data, function(i, v) {
if (v.remote == "brancher")
if (v.executor == "brancher")
branch_urls[v.branch] = v.results[0].link;
});
}
Expand Down
48 changes: 26 additions & 22 deletions ui/status.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -735,7 +735,7 @@ function load_result_table_one(data_raw, table, reported, avgs)

var a = "<a href=\"" + link + "\">";

if (v.remote != "brancher") {
if (v.executor != "brancher") {
var time = row.insertCell(2);

if (link)
Expand Down Expand Up @@ -862,24 +862,8 @@ function runner_name(v)

function load_result_table(data_raw, reload)
{
var branch_pull_status = {};
var branch_start = {};

// Parse branch info to extract pull status
$.each(branches_info, function(i, v) {
let summary = null;
$.each(v['base-pulls'], function(url, res) {
if (res == "okay" && !summary) {
summary = res;
} else if (res == "resolved" && (!summary || summary == "okay")) {
summary = res;
} else {
summary = res;
}
});
branch_pull_status[i] = summary;
});

// Decorate branchers and collect branch_start
$.each(data_raw, function(i, v) {
v.start = new Date(v.start);
Expand All @@ -890,7 +874,7 @@ function load_result_table(data_raw, reload)

branches.add(v.branch);

if (v.remote == "brancher") {
if (v.executor == "brancher") {
branch_start[v.branch] = v.start;
v.pull_status = branch_pull_status[v.branch];
}
Expand Down Expand Up @@ -1036,9 +1020,9 @@ function load_result_table(data_raw, reload)
}
}

let xfr_todo = 4;
let xfr_todo = 6;
let all_results = null;
let branches_info = null;
let branch_pull_status = {};
let branches = new Set();
let branch_results = {};

Expand Down Expand Up @@ -1159,7 +1143,21 @@ function filters_doit(data_raw)

function branches_loaded(data_raw)
{
branches_info = data_raw;
// Parse branch info to extract pull status
$.each(data_raw, function(i, v) {
let summary = null;
$.each(v['base-pulls'], function(url, res) {
if (res == "okay" && !summary) {
summary = res;
} else if (res == "resolved" && (!summary || summary == "okay")) {
summary = res;
} else {
summary = res;
}
});
branch_pull_status[i] = summary;
});

loaded_one();
}

Expand Down Expand Up @@ -1307,11 +1305,17 @@ function do_it()
$(document).ready(function() {
$.get("contest/branch-results.json", branch_res_doit)
});
$(document).ready(function() {
$.get("contest/branch-results-hw.json", branch_res_doit)
});
$(document).ready(function() {
$.get("query/results?branches=10&pending=y", results_loaded)
});
$(document).ready(function() {
$.get("contest/branches-info.json", branches_loaded)
$.get("contest/branches-info-nn.json", branches_loaded)
});
$(document).ready(function() {
$.get("contest/branches-info-hw.json", branches_loaded)
});
$(document).ready(function() {
$.get("query/flaky-tests?group-pfx=1", flakes_doit)
Expand Down
Loading