This is an automated email from the ASF dual-hosted git repository.
apupier pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new fd16dd3dc158 Fix Jenkins matrix filters
fd16dd3dc158 is described below
commit fd16dd3dc158ea88e066debdb67299f0cdedf3ff
Author: Minh Vu <[email protected]>
AuthorDate: Sat Jun 20 18:05:05 2026 +0200
Fix Jenkins matrix filters
Signed-off-by: Minh Vu <[email protected]>
---
Jenkinsfile | 14 +++++++++-----
Jenkinsfile.jdk26 | 14 +++++++++-----
2 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index b695f405139a..559ee7d5678c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -63,11 +63,15 @@ pipeline {
options {
throttle(['camel'])
}
- when { anyOf {
- expression { params.PLATFORM_FILTER == 'all' }
- expression { params.PLATFORM_FILTER == env.PLATFORM }
- expression { params.JDK_FILTER == 'all' }
- expression { params.JDK_FILTER == env.JDK_NAME }
+ when { allOf {
+ anyOf {
+ expression { params.PLATFORM_FILTER == 'all' }
+ expression { params.PLATFORM_FILTER == env.PLATFORM }
+ }
+ anyOf {
+ expression { params.JDK_FILTER == 'all' }
+ expression { params.JDK_FILTER == env.JDK_NAME }
+ }
} }
axes {
axis {
diff --git a/Jenkinsfile.jdk26 b/Jenkinsfile.jdk26
index ad6982802790..c1eebb908ead 100644
--- a/Jenkinsfile.jdk26
+++ b/Jenkinsfile.jdk26
@@ -68,11 +68,15 @@ pipeline {
options {
throttle(['camel'])
}
- when { anyOf {
- expression { params.PLATFORM_FILTER == 'all' }
- expression { params.PLATFORM_FILTER == env.PLATFORM }
- expression { params.JDK_FILTER == 'all' }
- expression { params.JDK_FILTER == env.JDK_NAME }
+ when { allOf {
+ anyOf {
+ expression { params.PLATFORM_FILTER == 'all' }
+ expression { params.PLATFORM_FILTER == env.PLATFORM }
+ }
+ anyOf {
+ expression { params.JDK_FILTER == 'all' }
+ expression { params.JDK_FILTER == env.JDK_NAME }
+ }
} }
axes {
axis {
