Repository navigation
fix(release-verify): check podling source disclaimers when explicitly enabled - #2114
liwenjie200543 wants to merge 3 commits into
Conversation
potiuk
left a comment
There was a problem hiding this comment.
Thanks for picking up part of #1172. The check itself is right, and I ran the Step 5 eval suite on this head: all three cases pass, the new podling case included.
Blocking — the skill has nowhere to read the stage from (plugins/magpie-release-management/skills/verify-rc/SKILL.md:245)
For an ASF project whose resolved
<project-stage>isincubating, add--podling
<project-stage> resolves only to the organization's vocabulary, project_stage_vocab: [incubating, top-level] in organizations/ASF/organization.md; no config key records which stage this project is in. So the agent has nothing to read, and the PR rightly forbids inferring it from the file. Either:
- add a
project_stagekey (inrelease-management-config.md, where the release skills already read their config) thatverify-rc load/argsreads, so--podlingis set by code, not by the model; or - until that key exists, have the skill ask the release manager once whether the project is incubating, as
committer-onboardingdoes (the precedent #1172 cites).
Major — two signals for "podling" in one run (tools/release-management/src/release_management/verify_rc/jvm.py:65)
The JVM recipe still decides podling from a DISCLAIMER / DISCLAIMER-WIP file at the source root. For a podling RC that lacks the file, Step 5 now fails, but Step 6b silently drops the POM-disclaimer check. Pass the same explicit stage to the JVM recipe when it is known, and keep the file only as the fallback.
Before this can be approved
The description says human review and ownership of the diff "have not been represented as completed" and asks not to mark it ready for review. Please review the change yourself and confirm in the description that you have, per the ASF's generative-tooling guidance; until then, keep the PR in draft.
This review was drafted by an AI-assisted tool and
confirmed by an Apache Magpie maintainer. After you've
addressed the points above and pushed an update, an Apache Magpie
maintainer — a real person — will take the next look
at the PR. The findings cite the project's review criteria;
if you think one of them is mis-applied, please reply on the
PR and a maintainer will weigh in.More on how Apache Magpie handles maintainer review:
Contributing guide.
MakerFlyFly
left a comment
There was a problem hiding this comment.
Thanks for adding this focused, opt-in check and covering both disclaimer filenames. This is a useful step toward podling release verification.
Building on the earlier review, I used Codex to check backward compatibility, boundary conditions, and failure propagation on 095617e3:
- 13 focused pytest cases passed.
- 84 input combinations confirmed that default JSON output matches the parent commit. With
--podling, directories, nested disclaimers, and files present only in the previous release do not satisfy the check. Existing NOTICE/LICENSEFAILandREVIEWresults remain intact when a disclaimer is present. - Eight command-generation scenarios confirmed that the flag reaches only
notice-licenseandall, and that the generated commands parse successfully. - Aggregate failure propagation was verified: a missing disclaimer produces an overall
FAIL, even with--status notice-license=PASS. GPG verification was mocked for this focused check.
I found no additional actionable defects in these paths. This adds regression evidence for the mechanical implementation; the outstanding findings from the earlier review still need to be resolved.
This content has been optimized by AI for better expression.
…file Review of apache#2114 found two signals for "podling" in one run: `args` took the flag from the caller, and the JVM recipe decided it from a DISCLAIMER file at the source root. For a podling RC that lacks that file — the defect Step 5 exists to catch — Step 6b silently dropped its POM-disclaimer check. Read `project_stage` from the loaded config instead: `VerifyRc.project_stage` normalises and validates it, `args` adds `--podling` itself, and `jvm` uses the same value, keeping the source-root file only as the fallback for a config that has not recorded one. `args` now states the stage and the resolved podling flag, and warns when an ASF project leaves the key unset, so the check cannot disappear without a word. `--podling` on `verify-rc args` survives as an explicit override. The skill text and `jvm-artefacts.md` now say where the value is read from and what to do (ask the RM once, then record it) when it is unset. Refs apache#1172
|
Thanks — both findings were right, and I took the config-key route for the blocking one.
For the second finding, On the draft: it stays in draft, and the description says so. I will leave the human-review confirmation to the PR owner rather than assert it here. |
7b4af2a to
04d3c36
Compare
…file Review of apache#2114 found two signals for "podling" in one run: `args` took the flag from the caller, and the JVM recipe decided it from a DISCLAIMER file at the source root. For a podling RC that lacks that file — the defect Step 5 exists to catch — Step 6b silently dropped its POM-disclaimer check. Read `project_stage` from the loaded config instead: `VerifyRc.project_stage` normalises and validates it, `args` adds `--podling` itself, and `jvm` uses the same value, keeping the source-root file only as the fallback for a config that has not recorded one. `args` now states the stage and the resolved podling flag, and warns when an ASF project leaves the key unset, so the check cannot disappear without a word. `--podling` on `verify-rc args` survives as an explicit override. The skill text and `jvm-artefacts.md` now say where the value is read from and what to do (ask the RM once, then record it) when it is unset. Refs apache#1172
|
Rebased onto
CI is green on |
… enabled Add opt-in disclaimer presence checks and sync generated mirrors. Partial implementation of apache#1172. Generated-by: OpenAI Codex
The organization manifest publishes only the lifecycle vocabulary (`project_stage_vocab: [incubating, top-level]`); nothing recorded which value applies to a given project, so the podling checks had no value to read and the skill was left inferring one from a release artefact. Add the optional, ASF-only `project_stage` key to the adopter template and to Magpie's own config (`top-level`), documenting that it is the only place the stage can come from and that `verify-rc args` adds `--podling` itself. Refs apache#1172
…file Review of apache#2114 found two signals for "podling" in one run: `args` took the flag from the caller, and the JVM recipe decided it from a DISCLAIMER file at the source root. For a podling RC that lacks that file — the defect Step 5 exists to catch — Step 6b silently dropped its POM-disclaimer check. Read `project_stage` from the loaded config instead: `VerifyRc.project_stage` normalises and validates it, `args` adds `--podling` itself, and `jvm` uses the same value, keeping the source-root file only as the fallback for a config that has not recorded one. `args` now states the stage and the resolved podling flag, and warns when an ASF project leaves the key unset, so the check cannot disappear without a word. `--podling` on `verify-rc args` survives as an explicit override. The skill text and `jvm-artefacts.md` now say where the value is read from and what to do (ask the RM once, then record it) when it is unset. Refs apache#1172
04d3c36 to
0d90fc4
Compare
|
Rebased onto @potiuk both findings from your review are addressed: the blocking one took the config-key route ( |
Summary
Add an opt-in source-root disclaimer check for ASF podlings.
release-verify notice-license --podlingandall --podlingreport FAIL when neither DISCLAIMER nor DISCLAIMER-WIP is a file at the source artefact root. Existing NOTICE/LICENSE checks and default output stay unchanged.The stage is read, not inferred:
release-management-config.mdgains an optional, ASF-onlyproject_stagekey (incubating/top-level), whichrelease-config loadcarries intoconfigandverify-rcreads.verify-rc argsadds--podlingby itself forincubating, andverify-rc jvm(Step 6b) uses the same value, so a podling RC that lacks its disclaimer no longer passes Step 5 while silently dropping Step 6b's POM-disclaimer check. TheDISCLAIMER/DISCLAIMER-WIPfile at the source root stays only as the fallback for a config that has not recorded the stage, andargswarns when an ASF project leaves the key unset rather than dropping the check quietly.--podlingremains an explicit override.Wire the flag through
release-management verify-rc args, document the stage-based opt-in in verify-rc andjvm-artefacts.md, and add CLI, aggregate-verdict and skill-eval fixtures.Partial implementation of #1172 only. This does not add IPMC voting, incubator distribution paths, version-suffix checks, or validate disclaimer wording/legal compliance. It checks the separate-file convention requested by the issue, not whether an IPMC has approved a release.
Review round 1 (blocking + major findings)
project_stageconfig key described above (VerifyRc.project_stagenormalises it and validates it against the organization'sproject_stage_vocab), with the "ask the RM once, then record it" path written into the skill for an unset key.verify-rc jvmtakes the recorded stage first and falls back to the source-root file only when the key is unset.Review round 2
A second review used Codex to check backward compatibility, boundary conditions and failure propagation on
095617e3, finding no further actionable defects there. Two of its evidence points are re-checked on the current head by tests that assert them directly:--podlingreaching onlynotice-licenseandall(test_podling_flag_only_on_source_disclaimer_commands), and the aggregateFAILwith a missing disclaimer (release-verify, untouched here). One stated invariant does change on purpose and is called out rather than silently dropped:verify-rc argsnow also reportsproject_stageandpodling, so the default JSON is no longer byte-identical to the parent commit, though every command it emits is.Rebase onto main (head
04d3c366)Rebased onto
main@f35629d4. The whole conflict was this skill's ownmeasured_tokens:stamp:mainre-stampedverify-rc/SKILL.mdto 6881 for #2162 after this branch had stamped it, so the two sides disagreed on one frontmatter line while every hunk of prose auto-merged. The stamp was re-measured against the merged file rather than taken from either side — 7038 after the first commit, 7140 at the head — so it accounts for #2162's text and this change together, which is what themeasurejob checks.git range-diffover the two ranges: the middle commit is byte-identical, and the first and third differ only in that stamp line. #2162'ssandbox-golden-ruleblock and #2157's link fixes in the two eval READMEs are preserved;surface_hashis unchanged because no heading orrequires_config:entry moved.Verification
095617e3on this Windows checkout and touch no changed code:test_shellasserts POSIX shell quoting, andtest_integration'sswhid_dir_notecompares agit archivetree with this checkout's symlink-materialised working tree./), including the four layer-resolution tests and the three vote-tally roster-path tests.project_stagenormalisation and validation;argsemitting--podlingonly forincubatingand only onnotice-license/all; the unset-key warning and its absence for a non-ASF adopter;--podlingstaying an override; Step 6b taking the configured stage over the tree, in both directions; the template'sproject_stageparsing to unset;loadcarrying the key intoconfig.project_stage: incubating→argsemits--podlingwith no warning; unset → warning, no flag;top-level→ no flag, no warning; an invalid value → exit 2 naming both allowed stages;jvmwithincubatingand no DISCLAIMER anywhere in the tree → recipe carries--podling.release-management(50 source files).measured_tokensre-measured forverify-rc/SKILL.md(7140 on the rebased head; 6832 before the rebase);surface_hashunchanged (no heading orrequires_configmovement).plugins/magpie-security-tools/tools/release-management,plugins/magpie-setup/templates/release-management-config.md).prek: passes in CI on the rebased head; it was not run in the local environment this was written in.AI disclosure
Implementation, test preparation and this description were AI-generated, per the ASF generative-tooling guidance. I have read the full diff myself and I own it: the
project_stageread and validation path (common.py:86-107), the flag placement and warning inargs.py:88-89,121-126,136-145, the Step 6b stage precedence (jvm.py:225-241), the CLI default (cli.py:78-83), the adopter template and Magpie's own config, and the new tests. Nothing in this change reaches review without a human having gone through it.