Skip to content

Commit 2c23d49

Browse files
izaitsevfbIvan Zaitsev
authored andcommitted
Stop filtering autorevert restart jobs out of hud_query / commit_jobs_query
Reverts the restart-exclusion clauses PR #6954 added to these two queries, so autorevert's workflow_dispatch restart runs (head_branch = 'trunk/<sha>') are present in the job data HUD reads. #6954 added the filter as a measurement-isolation guard for autorevert shadow mode -- keeping the queries reading the same signal autorevert itself acted on. That goal no longer applies; test-infra#8300 now wants the restart signal surfaced and credited. Deliberately NOT reverted here: - commit_jobs_batch_query (viable/strict gate) -- measured regression, see PR - autorevert_checker.py, flaky_tests/across_jobs -- dead code Refs: #8300
1 parent 936e72e commit 2c23d49

2 files changed

Lines changed: 0 additions & 3 deletions

File tree

torchci/clickhouse_queries/commit_jobs_query/query.sql

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ WITH job AS (
4646
AND job.name != 'generate-test-matrix'
4747
AND workflow.event != 'workflow_run' -- Filter out workflow_run-triggered jobs, which have nothing to do with the SHA
4848
AND workflow.event != 'repository_dispatch' -- Filter out repository_dispatch-triggered jobs, which have nothing to do with the SHA
49-
AND NOT (workflow.event = 'workflow_dispatch' AND workflow.head_branch LIKE 'trunk/%') -- Filter out restart jobs
5049
AND workflow.id in (select id from materialized_views.workflow_run_by_head_sha where head_sha = {sha: String})
5150
AND (
5251
{workflowId: Int64} = 0
@@ -94,7 +93,6 @@ WITH job AS (
9493
WHERE
9594
workflow.event != 'workflow_run' -- Filter out workflow_run-triggered jobs, which have nothing to do with the SHA
9695
AND workflow.event != 'repository_dispatch' -- Filter out repository_dispatch-triggered jobs, which have nothing to do with the SHA
97-
AND NOT (workflow.event = 'workflow_dispatch' AND workflow.head_branch LIKE 'trunk/%') -- Filter out restart jobs
9896
AND workflow.id in (select id from materialized_views.workflow_run_by_head_sha where head_sha = {sha: String})
9997
AND (
10098
{workflowId: Int64} = 0

torchci/clickhouse_queries/hud_query/query.sql

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ WITH job AS (
3333
) -- Should be filtered out by the workflow_event filters, but workflow_event takes some time to populate
3434
AND job.workflow_event != 'workflow_run' -- Filter out workflow_run-triggered jobs, which have nothing to do with the SHA
3535
AND job.workflow_event != 'repository_dispatch' -- Filter out repository_dispatch-triggered jobs, which have nothing to do with the SHA
36-
AND NOT (job.workflow_event = 'workflow_dispatch' AND job.head_branch LIKE 'trunk/%') -- Filter out restart jobs
3736
AND job.id in (select id from materialized_views.workflow_job_by_head_sha where head_sha in {shas: Array(String)})
3837
AND job.repository_full_name = {repo: String}
3938
AND job.workflow_name != 'Upload test stats while running' -- Continuously running cron job that cancels itself to avoid running concurrently

0 commit comments

Comments
 (0)