Skip to content

Fix Jenkins matrix filters#24154

Open
fallintoplace wants to merge 1 commit into
apache:mainfrom
fallintoplace:fix-jenkins-matrix-filters
Open

Fix Jenkins matrix filters#24154
fallintoplace wants to merge 1 commit into
apache:mainfrom
fallintoplace:fix-jenkins-matrix-filters

Conversation

@fallintoplace

Copy link
Copy Markdown

Summary

  • Require the platform filter and JDK filter to both match before a matrix cell runs.
  • Apply the same filter logic to the JDK 26 Jenkinsfile.

Root cause

The matrix when block used one broad anyOf, so selecting a platform could also run every JDK on that platform, and selecting a JDK could also run that JDK across every platform. The filters are independent dimensions, so each dimension needs its own wildcard-or-match check.

Validation

  • git diff --check -- Jenkinsfile Jenkinsfile.jdk26
  • Ran a small truth-table sanity check: selecting one platform and one JDK now allows exactly one cell instead of five.

Signed-off-by: Minh Vu <vuhoangminh97@gmail.com>
@davsclaus davsclaus requested a review from apupier June 20, 2026 16:27

@davsclaus davsclaus left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct fix — the anyOf flattening meant selecting one dimension (platform or JDK) would match all values in the other dimension. The allOf { anyOf { ... } anyOf { ... } } nesting properly makes the two filters independent. Both Jenkinsfiles updated consistently. LGTM.

This review was generated by an AI agent and may contain inaccuracies. Please verify all suggestions before applying.

@github-actions

Copy link
Copy Markdown
Contributor

🌟 Thank you for your contribution to the Apache Camel project! 🌟
🤖 CI automation will test this PR automatically.

🐫 Apache Camel Committers, please review the following items:

  • First-time contributors require MANUAL approval for the GitHub Actions to run
  • You can use the command /component-test (camel-)component-name1 (camel-)component-name2.. to request a test from the test bot although they are normally detected and executed by CI.
  • You can label PRs using skip-tests and test-dependents to fine-tune the checks executed by this PR.
  • Build and test logs are available in the summary page. Only Apache Camel committers have access to the summary.

⚠️ Be careful when sharing logs. Review their contents before sharing them publicly.

@github-actions github-actions Bot added the ci label Jun 20, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants