Skip to content

Commit d791953

Browse files
committed
Describe the split Gradle legs in comments and docs
The PR-tier comment and docs/testing/README.md still described an agent + hosted leg per line. Say which job the old leg outlasted, and rename the tier test's tuple to match its rows. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01L25ziyhTM91GYbb3nbj1XY
1 parent 08c3153 commit d791953

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1336,9 +1336,9 @@ jobs:
13361336
# Lines that run both capstones run them in one leg (one Maven
13371337
# install; the run step loops over `suite`).
13381338
- {os: ubuntu-latest, suite: e2e_redirect_maven_build e2e_vendor_maven_build, jvm_tool: maven, maven: '3.9.16'}
1339-
# Real-Gradle capstones, PR tier: one leg per Gradle line x {agent +
1340-
# hosted, vendor + multi-project} on ubuntu, each on its line's LTS
1341-
# JDK. Every other OS x line x mode cell (and the JDK-ceiling,
1339+
# Real-Gradle capstones, PR tier: legs per Gradle line x {agent,
1340+
# hosted (three shards), vendor + multi-project} on ubuntu, each on
1341+
# its line's LTS JDK. Every other OS x line x mode cell (and the JDK-ceiling,
13421342
# configuration-cache, Isolated Projects and real-Central rows) runs
13431343
# in gradle-compatibility.yml. `suite` lists every binary the leg
13441344
# runs (space-separated); the libtest filters select by the prefix
@@ -1353,8 +1353,8 @@ jobs:
13531353
# names, and a catch-all that `--skip`s exactly those words, so a
13541354
# new test always lands in some leg (test_ci_gradle_prefixes.py
13551355
# keeps the skip list in sync). The agent suites get a leg of their
1356-
# own: run before `gradle_hosted_[345]` in one leg they took 4.3-6.2
1357-
# min, past coverage on slow hosts.
1356+
# own: sharing one with `gradle_hosted_[345]`, that leg took 4.3-6.2
1357+
# min and often outlasted the `coverage` job, setting `ci-ok`.
13581358
- {os: ubuntu-latest, suite: 'e2e_gradle_discovery_build e2e_gradle_agent_build', jvm_tool: gradle, gradle: '9.8.0', java: '21', test_filter: '--ignored gradle_agent_'}
13591359
- {os: ubuntu-latest, suite: e2e_redirect_gradle_build, jvm_tool: gradle, gradle: '9.8.0', java: '21', test_filter: '--ignored gradle_hosted_3 gradle_hosted_4 gradle_hosted_5'}
13601360
# Real-sbt hosted (socket-patch.sbt) + vendored

‎docs/testing/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ reach Maven Central.
5555

5656
| Tier | Where | Cells |
5757
| --- | --- | --- |
58-
| PR | `ci.yml` `e2e` job | ubuntu × {6.9.4 / JDK 11, 7.6.6 / JDK 17, 8.14.3 / JDK 21, 9.8.0 / JDK 21} × {agent + hosted, vendored + multi-project}, plus Windows 8.14.3 multi-project |
58+
| PR | `ci.yml` `e2e` job | ubuntu × {6.9.4 / JDK 11, 7.6.6 / JDK 17, 8.14.3 / JDK 21, 9.8.0 / JDK 21} × {agent, hosted (three shards), vendored + multi-project}, plus Windows 8.14.3 multi-project |
5959
| Full | [`gradle-compatibility.yml`](../../.github/workflows/gradle-compatibility.yml) (path-filtered PRs, nightly, manual) | {ubuntu, macOS arm64, Windows} × the four lines × {agent, hosted, vendored} = 36 cells; JDK ceilings (6.9 on 15, 7.6 on 19, 8.14 on 24); `--configuration-cache` (9.8.0 hosted and vendored); Isolated Projects (9.8.0 hosted, recording only); real Maven Central (8.14.3, #511 and #487) |
6060

6161
Every full-tier cell uploads JSON probe reports (Gradle and JDK version, resolved jar

‎scripts/tests/test_ci_e2e_tiers.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ def test_bundle_reads_cargo_json(self):
128128
# HostedShards checks every hosted test runs in exactly one of them).
129129
HOSTED_SHARD_1 = ["gradle_hosted_3", "gradle_hosted_4", "gradle_hosted_5"]
130130
HOSTED_SHARD_2 = ["gradle_hosted_" + c for c in "bcdeflmnop"]
131-
AGENT_HOSTED = (
131+
AGENT_AND_HOSTED_SHARDS = (
132132
("e2e_gradle_discovery_build e2e_gradle_agent_build", "--ignored gradle_agent_"),
133133
("e2e_redirect_gradle_build", " ".join(["--ignored", *HOSTED_SHARD_1])),
134134
("e2e_redirect_gradle_build", " ".join(["--ignored", *HOSTED_SHARD_2])),
@@ -171,7 +171,7 @@ def test_pr_rows_are_the_lean_table(self):
171171
gradle = [r for r in rows("e2e") if r.get("jvm_tool") == "gradle"]
172172
want = []
173173
for line, java in GRADLE_LINES.items():
174-
for suite, test_filter in (*AGENT_HOSTED, VENDOR):
174+
for suite, test_filter in (*AGENT_AND_HOSTED_SHARDS, VENDOR):
175175
row = {"os": "ubuntu-latest", "suite": suite, "jvm_tool": "gradle", "gradle": line,
176176
"java": java, "test_filter": test_filter}
177177
# The allowance lasts only while a suite of the row is unlanded.

0 commit comments

Comments
 (0)