Repository navigation
Conversation
…ental testing Five modules were missing from EXCLUSION_LIST in incremental-build.sh and were being pulled into the test reactor via -amd whenever camel-catalog or its dependents changed: - camel-jbang-mcp - camel-jbang-plugin-validate - camel-launcher-container - camel-yaml-dsl-validator - camel-yaml-dsl-validator-maven-plugin The existing filterExclusions() already handles the "primary changed module" case: when any of these modules is itself the changed module, its exclusion entry is automatically lifted so the test runs normally. Note: camel-jbang-plugin-route-parser was removed from the codebase (CAMEL-25587) and is not added. Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
|
🌟 Thank you for your contribution to the Apache Camel project! 🌟 🐫 Apache Camel Committers, please review the following items:
|
davsclaus
left a comment
There was a problem hiding this comment.
Thanks, this cuts real noise: these five come in through camel-catalog on almost every component PR. I checked that the directory names match the artifact IDs (so filterExclusions lifts an entry when the module itself changed) and that exclusions outside the -amd reactor are dropped before Maven sees them.
One tradeoff that should be explicit: with -amd, !:module removes the module from the reactor (not even compiled), and the entry is only lifted when that module is itself a primary change. So these modules also stop being tested for their direct upstreams, not just camel-catalog:
camel-yaml-dsl-validator(30 test classes): changes to camel-yaml-dsl, camel-yaml-io, camel-xml-io, camel-core-languages, camel-kamelet-main-support.camel-jbang-mcp(44 test classes): changes to camel-chaos, camel-rest-openapi, camel-yaml-io, camel-xml-io, camel-jbang-core.camel-jbang-plugin-validateandcamel-yaml-dsl-validator-maven-plugin: a change to camel-yaml-dsl-validator itself no longer compiles or tests its two direct consumers.
That fits how camel-jbang-core and camel-yaml-dsl are already handled, so I'm fine with the direction, but could we at least add manual-it-mapping.txt entries (e.g. camel-yaml-dsl-validator -> camel-jbang-plugin-validate, camel-yaml-io/camel-yaml-dsl -> camel-yaml-dsl-validator) so CI tells the author which tests to run, or note the tradeoff in CI-ARCHITECTURE.md? A small committed test for filterExclusions next to pr_diff_test.sh would also be welcome (the description mentions a local one).
Reviewed with Claude Code on behalf of davsclaus. This review was generated by an AI agent and may contain inaccuracies; please verify all suggestions before applying.
oscerd
left a comment
There was a problem hiding this comment.
Right maintenance of the exclusion list. The CI step builds the components without the catalog-dependent and tooling modules, and the list had fallen behind the modules added since: this adds camel-jbang-mcp, camel-jbang-plugin-validate, camel-launcher-container, camel-yaml-dsl-validator and camel-yaml-dsl-validator-maven-plugin, which are exactly the jbang, launcher and validator modules that belong with the ones already excluded. Keeping the list current is what stops those modules from being pulled transitively into a step that is not meant to build them. Small and correct.
Claude Code on behalf of oscerd
…Exclusions test - Add manual-it-mapping.txt entries for the 5 newly excluded modules (camel-jbang-mcp, camel-jbang-plugin-validate, camel-launcher-container, camel-yaml-dsl-validator, camel-yaml-dsl-validator-maven-plugin), all pointing to camel-jbang-it, so contributors are advised to run the integration tests when modifying these modules. - Add incremental-build-filter-test.sh with 7 unit tests for filterExclusions: covers path-based match, colon-style :artifactId match, multiple matches, all-lifted, empty build_pl, and prefix non-match edge case.
gnodet-bot
left a comment
There was a problem hiding this comment.
LGTM. The 5 new EXCLUSION_LIST entries are correct and match the 5 manual-it-mapping.txt additions 1:1. All of @davsclaus's review feedback is addressed: the mapping entries are in place and the new incremental-build-filter-test.sh covers 7 cases including the prefix non-match edge case that validates the comma-sentinel matching logic.
The awk+eval extraction approach (instead of source) is the right design choice since incremental-build.sh has executable code outside functions that would trigger side effects on direct source.
This review was generated by an AI agent, Hermès on behalf of @gnodet.
davsclaus
left a comment
There was a problem hiding this comment.
Thanks for adding the mapping entries, the tradeoff section and the tests.
One problem: incremental-build-filter-test.sh is not run by CI. pr-ci-scripts-validation.yml runs for test in *_test.sh, and this file name has -test.sh (hyphen), so the "PR CI scripts validation" run on d2feb36 passed without it. Renaming it to incremental_build_filter_test.sh, like pr_diff_test.sh and reactor_timing_test.sh, makes the description's "picked up automatically" true.
On the mapping: the new entries fire when one of the five modules is itself changed, and then its exclusion is lifted and its own tests already run. The gap from my earlier review is the other direction: a change to camel-yaml-dsl / camel-yaml-io no longer builds camel-yaml-dsl-validator, and a change to camel-yaml-dsl-validator no longer builds camel-jbang-plugin-validate and camel-yaml-dsl-validator-maven-plugin. Entries keyed on those upstreams (e.g. camel-yaml-dsl-validator:dsl/camel-yaml-dsl/camel-yaml-dsl-validator-maven-plugin:mvn verify -f ...) would cover it. With the tradeoff written down in the description, I'm fine leaving that as is if you prefer; the rename is the part I'd like before merging.
Reviewed with Claude Code on behalf of davsclaus. This review was generated by an AI agent and may contain inaccuracies; please verify all suggestions before applying.
Summary
Add 5 missing artifact IDs to
EXCLUSION_LISTinincremental-build.shso they are not spuriously pulled into targeted test runs when unrelated modules change.Root Cause
The incremental build script uses
-amd(also-make-dependents) when computing which modules to test after a change. Any module that depends oncamel-catalog(directly or transitively) is pulled into the reactor. Five modules were missing fromEXCLUSION_LISTand were being tested on everycamel-catalog-touching PR:camel-jbang-mcpcamel-jbang-plugin-validatecamel-launcher-containercamel-yaml-dsl-validatorcamel-yaml-dsl-validator-maven-pluginFix
Add the five artifact IDs to
EXCLUSION_LISTon line 51 of.github/actions/incremental-build/incremental-build.sh, grouped after the existingcamel-launcherentry.The existing
filterExclusions()function (line 83) already handles the "this module IS the changed module" case: when any of these modules is itself the primary changed module, its exclusion entry is automatically lifted, so direct changes to these modules are still tested normally.Add
manual-it-mapping.txtentries for all 5 new modules, pointing tocamel-jbang-it. When a contributor modifies one of these modules, CI will now post an advisory to run:Add
incremental-build-filter-test.shwith 7 unit tests forfilterExclusions(): path-based match, colon-style:artifactIdmatch, multiple matches, all-lifted, emptybuild_pl, and prefix non-match edge case. The script is picked up automatically by thepr-ci-scripts-validation.ymlCI workflow.Note:
camel-jbang-plugin-route-parserwas removed from the codebase (CAMEL-25587) and is not added.Tradeoff
With
-amd,!:moduleremoves the module from the reactor (not even compiled). These 5 modules also stop being tested for their direct upstreams (not just camel-catalog). This is consistent with howcamel-jbang-coreandcamel-yaml-dslare already handled. Themanual-it-mapping.txtentries advise contributors to run the integration tests manually when they touch these modules.Fixes CAMEL-23326
Hermes Agent (Claude Sonnet 4.6) on behalf of Guillaume Nodet