diff --git a/.github/actions/incremental-build/incremental-build-filter-test.sh b/.github/actions/incremental-build/incremental-build-filter-test.sh new file mode 100755 index 0000000000000..e800c84acfa08 --- /dev/null +++ b/.github/actions/incremental-build/incremental-build-filter-test.sh @@ -0,0 +1,106 @@ +#!/usr/bin/env bash +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# Unit tests for the filterExclusions function in incremental-build.sh. +# Tests that exclusions are dropped when the excluded module is an explicitly +# included primary change, and kept otherwise. + +set -euo pipefail + +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" + +# Extract and load only filterExclusions from incremental-build.sh without +# running main(). awk pulls the function body between its opening brace +# and the matching closing brace (depth-tracked), then eval loads it. +_fn_body=$(awk ' + /^filterExclusions\(\)/ { in_fn=1; depth=0 } + in_fn { + for (i=1; i<=length($0); i++) { + c = substr($0, i, 1) + if (c == "{") depth++ + if (c == "}") depth-- + } + print + if (in_fn && depth == 0) { in_fn=0 } + } +' "${SCRIPT_DIR}/incremental-build.sh") +eval "$_fn_body" + +pass=0 +fail=0 + +assert_eq() { + local expected="$1" + local actual="$2" + local message="$3" + if [[ "$expected" == "$actual" ]]; then + pass=$((pass + 1)) + else + echo "FAIL: $message" + echo " expected: [$expected]" + echo " actual: [$actual]" + fail=$((fail + 1)) + fi +} + +EXCLUSION_LIST="!:camel-allcomponents,!:camel-catalog,!:camel-yaml-dsl,!:camel-jbang-core" + +# 1. Normal case: no overlap between build_pl and exclusions → all exclusions kept +result=$(filterExclusions "components/camel-kafka" "$EXCLUSION_LIST" 2>/dev/null) +assert_eq "$EXCLUSION_LIST" "$result" \ + "no overlap: all exclusions are retained" + +# 2. build_pl contains a path whose basename matches an excluded artifact → +# that exclusion is lifted (the module is a primary change, not a downstream) +result=$(filterExclusions "dsl/camel-yaml-dsl,components/camel-kafka" "$EXCLUSION_LIST" 2>/dev/null) +assert_eq "!:camel-allcomponents,!:camel-catalog,!:camel-jbang-core" "$result" \ + "path-based match: exclusion for camel-yaml-dsl is lifted" + +# 3. build_pl contains an :artifactId-style reference → that exclusion is lifted +result=$(filterExclusions ":camel-jbang-core,components/camel-kafka" "$EXCLUSION_LIST" 2>/dev/null) +assert_eq "!:camel-allcomponents,!:camel-catalog,!:camel-yaml-dsl" "$result" \ + "colon-style match: exclusion for camel-jbang-core is lifted" + +# 4. Multiple matches: both a path-based and colon-based exclusion are lifted +result=$(filterExclusions "dsl/camel-yaml-dsl,:camel-jbang-core" "$EXCLUSION_LIST" 2>/dev/null) +assert_eq "!:camel-allcomponents,!:camel-catalog" "$result" \ + "multiple matches: both camel-yaml-dsl and camel-jbang-core exclusions are lifted" + +# 5. All exclusions lifted (every excluded module is a primary change) +SMALL_EXCL="!:camel-catalog,!:camel-yaml-dsl" +result=$(filterExclusions "dsl/camel-yaml-dsl,:camel-catalog" "$SMALL_EXCL" 2>/dev/null) +assert_eq "" "$result" \ + "all exclusions lifted when every excluded module is a primary change" + +# 6. Empty build_pl → all exclusions retained (edge case: nothing changed) +result=$(filterExclusions "" "$EXCLUSION_LIST" 2>/dev/null) +assert_eq "$EXCLUSION_LIST" "$result" \ + "empty build_pl: all exclusions are retained" + +# 7. Exclusion whose basename is a prefix of an included module must NOT be lifted +# (camel-yaml vs camel-yaml-dsl: basename matching is exact, not prefix) +EXCL_PREFIX="!:camel-yaml" +result=$(filterExclusions "dsl/camel-yaml-dsl" "$EXCL_PREFIX" 2>/dev/null) +assert_eq "$EXCL_PREFIX" "$result" \ + "prefix non-match: camel-yaml exclusion is NOT lifted by camel-yaml-dsl module" + +echo "" +echo "incremental-build-filter-test.sh: ${pass} passed, ${fail} failed" +if [[ "$fail" -ne 0 ]]; then + exit 1 +fi diff --git a/.github/actions/incremental-build/incremental-build.sh b/.github/actions/incremental-build/incremental-build.sh index 29b472809a3c3..d53b5ea4c3c92 100755 --- a/.github/actions/incremental-build/incremental-build.sh +++ b/.github/actions/incremental-build/incremental-build.sh @@ -48,7 +48,7 @@ echo "Using MAVEN_EXTRA_ARGS=${MAVEN_EXTRA_ARGS:-}" maxNumberOfTestableProjects=50 # Modules excluded from targeted testing (generated code, meta-modules, etc.) -EXCLUSION_LIST="!:camel-allcomponents,!:dummy-component,!:camel-catalog,!:camel-catalog-console,!:camel-catalog-maven,!:camel-catalog-suggest,!:camel-route-parser,!:camel-report-maven-plugin,!:camel-endpointdsl,!:camel-componentdsl,!:camel-endpointdsl-support,!:camel-yaml-dsl,!:camel-kamelet-main,!:camel-yaml-dsl-deserializers,!:camel-yaml-dsl-maven-plugin,!:camel-jbang-core,!:camel-jbang-main,!:camel-jbang-plugin-generate,!:camel-jbang-plugin-edit,!:camel-jbang-plugin-kubernetes,!:camel-jbang-plugin-test,!:camel-launcher,!:camel-jbang-it,!:camel-itest,!:docs,!:apache-camel" +EXCLUSION_LIST="!:camel-allcomponents,!:dummy-component,!:camel-catalog,!:camel-catalog-console,!:camel-catalog-maven,!:camel-catalog-suggest,!:camel-route-parser,!:camel-report-maven-plugin,!:camel-endpointdsl,!:camel-componentdsl,!:camel-endpointdsl-support,!:camel-yaml-dsl,!:camel-kamelet-main,!:camel-yaml-dsl-deserializers,!:camel-yaml-dsl-maven-plugin,!:camel-jbang-core,!:camel-jbang-main,!:camel-jbang-plugin-generate,!:camel-jbang-plugin-edit,!:camel-jbang-plugin-kubernetes,!:camel-jbang-plugin-test,!:camel-launcher,!:camel-jbang-mcp,!:camel-jbang-plugin-validate,!:camel-launcher-container,!:camel-yaml-dsl-validator,!:camel-yaml-dsl-validator-maven-plugin,!:camel-jbang-it,!:camel-itest,!:docs,!:apache-camel" # Allow projects to override the exclusion list diff --git a/.github/actions/incremental-build/manual-it-mapping.txt b/.github/actions/incremental-build/manual-it-mapping.txt index 042bf0cebdf1d..fffe6abcf0eed 100644 --- a/.github/actions/incremental-build/manual-it-mapping.txt +++ b/.github/actions/incremental-build/manual-it-mapping.txt @@ -13,3 +13,8 @@ camel-jbang-plugin-edit:dsl/camel-jbang/camel-jbang-it:mvn verify -f dsl/camel-j camel-jbang-plugin-kubernetes:dsl/camel-jbang/camel-jbang-it:mvn verify -f dsl/camel-jbang/camel-jbang-it -Djbang-it-test camel-jbang-plugin-test:dsl/camel-jbang/camel-jbang-it:mvn verify -f dsl/camel-jbang/camel-jbang-it -Djbang-it-test camel-launcher:dsl/camel-jbang/camel-jbang-it:mvn verify -f dsl/camel-jbang/camel-jbang-it -Djbang-it-test +camel-jbang-mcp:dsl/camel-jbang/camel-jbang-it:mvn verify -f dsl/camel-jbang/camel-jbang-it -Djbang-it-test +camel-jbang-plugin-validate:dsl/camel-jbang/camel-jbang-it:mvn verify -f dsl/camel-jbang/camel-jbang-it -Djbang-it-test +camel-launcher-container:dsl/camel-jbang/camel-jbang-it:mvn verify -f dsl/camel-jbang/camel-jbang-it -Djbang-it-test +camel-yaml-dsl-validator:dsl/camel-jbang/camel-jbang-it:mvn verify -f dsl/camel-jbang/camel-jbang-it -Djbang-it-test +camel-yaml-dsl-validator-maven-plugin:dsl/camel-jbang/camel-jbang-it:mvn verify -f dsl/camel-jbang/camel-jbang-it -Djbang-it-test