Repository navigation
Implement CI merge queue #5838
Description
What is the problem the feature request solves?
A followup on #5830 (comment)
Describe the potential solution
- Implement merge queue that has most of the heavyweight tests
- Local PRs should run stripped version
- Investigate run spark tests locally
Additional context
No response
Activity
andygrove commentedon Sep 10, 2026
looking into this
andygrove commentedon Sep 10, 2026
I looked into how we'd actually turn this on. Short version: it's self-serve in
.asf.yamlnow, no INFRA ticket needed..asf.yamlrulesets accept a raw GitHub Rulesets API payload, andasfyaml/feature/github/rulesets.pypasses raw payloads straight through with no rule-type allowlist — its_NUMERICAL_VALUE_KEYSset even names the merge-queue parameters explicitly, so it's deliberate rather than a loophole. apache/iceberg-python, apache/seatunnel and apache/texera are all running merge queues configured this way;gh api repos/apache/iceberg-python/rulesetsshows the live ruleset. seatunnel is the closest match to our setup because it keeps the newrulesetsblock alongside classicprotected_brancheson the same branch, which is what we need since our review requirement lives there.Worth saying that apache/datafusion is not the template here, even though it's the obvious place to look. Their
.asf.yamlhas no merge-queue config at all andgh api repos/apache/datafusion/rulesetsreturns[]— INFRA turned theirs on directly in classic branch protection via INFRA-27154 in September 2025, before asfyaml supported rulesets. apache/datafusion#6880 has the full history. What's worth copying from them is the workflow side, and more usefully the mistake: apache/datafusion#17538 and its revert in apache/datafusion#17629 are them enabling required checks, discovering that a workflow which never triggers leaves its required check pending forever, and backing it out.We have a nastier version of that same problem. Our heavy jobs in
ci.ymlare thin callers of reusable workflows, and the check name a caller publishes depends on whether it ran:if:— one check run named exactlyPR Build (Linux), conclusionskippedPR Build (Linux) / Spark 4.1, JDK 17 [exec]and friends, and no barePR Build (Linux)at allI confirmed both against real commits (bdd2aeb and 36caf8e). So there is no name that reports in both cases: requiring the bare name hangs every code PR, requiring a nested name hangs every docs-only PR, and in both directions it hangs rather than fails. A required context that never reports also blocks the merge that would fix
.asf.yaml, and only INFRA can remove a required check by hand at that point. The way out is a single flat aggregator job — oneRequired Checksthatneeds:everything and goes red only onfailure/cancelled— and that being the only required context.On the split itself, what I've got working:
That last line matters more than it looks. If we add a queue but keep the existing full push-to-main runs, every merge pays for CI twice and total load goes up rather than down. The saving comes from PRs no longer running Spark 3.5 on every push, plus the queue replacing the push-to-main run instead of adding to it. Spark 4.1 stays in the PR tier because it's the default build profile and so the cheapest early warning that something is wrong.
Two things that need doing outside the repo. First,
run-spark-3.4-testsdoesn't exist as a label (onlyrun-spark-4.0-tests,run-iceberg-testsandrun-spark-4.2-testsdo), so that escape hatch has been quietly doing nothing already; we'd need to create it andrun-spark-3.5-tests. Second, this should merge in two steps — theci.ymlchanges first so we can watchRequired Checksreport correctly on real PRs, and only then the.asf.yamlchange that makes it required and turns the queue on. Getting that order wrong is precisely the case that needs an INFRA ticket to recover from.One thing worth raising more widely before we flip it: once these suites gate the queue, a flaky test blocks everyone's merges rather than just one PR. datafusion sent a dev@ note ahead of enabling theirs, and given this changes how every committer merges, we should probably do the same.
ci: add a Required Checks aggregator job so main can have a required …
ci: move the Spark 3.4/3.5/4.0 suites behind a merge queue
ci: move the Spark 3.4/3.5/4.0 suites behind a merge queue
ci: add a Required Checks aggregator job so main can have a required …
ci: move the Spark 3.4/3.5/4.0, Iceberg, macOS and benchmark suites b…
ci: retry the Maven wrapper bootstrap in every job that calls ./mvnw …
ci: retry the Maven wrapper bootstrap in every job that calls ./mvnw …