(camel) branch main updated: CAMEL-23121 - fix Kafka Strimzi test service and use it on non-linux OS (#21878)

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

davsclaus 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 3bb57c79a48c CAMEL-23121 - fix Kafka Strimzi test service and use it on non-linux OS (#21878)
3bb57c79a48c is described below

commit 3bb57c79a48c9a8166119b5a91fe4281fa8f54a9
Author: Aurélien Pupier <ap...@ibm.com>
AuthorDate: Tue Mar 10 07:50:05 2026 +0100

    CAMEL-23121 - fix Kafka Strimzi test service and use it on non-linux OS (#21878)
    
    on CI
    
    - 2 parameters were wrongly configured
    - keeping the Apache image on Linux because several tests are disabled
    with Strimzi image, so it allows having a better coverage
    
    Signed-off-by: Aurélien Pupier <ap...@ibm.com>
---
 Jenkinsfile                                                           | 3 ++-
 .../org/apache/camel/test/infra/kafka/services/StrimziContainer.java  | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index ae3de2f3d99d..e4da17bc74b2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -21,8 +21,9 @@ def MAVEN_TEST_PARAMS_UBUNTU = env.MAVEN_TEST_PARAMS ?: "-Dci.env.name=apache.or
 Below parameters are required for camel/core/camel-core module's test cases to pass on ppc64 and s390x
 - xpathExprGrpLimit: limits the number of groups an Xpath expression can contain
 - xpathExprOpLimit: limits the number of operators an Xpath expression can contain
+The Kafka parameter is because the apache/kafka image is not working on alternative OSes
 */
-def MAVEN_TEST_PARAMS_ALT_ARCHS = "-Djdk.xml.xpathExprGrpLimit=100 -Djdk.xml.xpathExprOpLimit=2000"
+def MAVEN_TEST_PARAMS_ALT_ARCHS = "-Djdk.xml.xpathExprGrpLimit=100 -Djdk.xml.xpathExprOpLimit=2000 -Dkafka.instance.type=local-strimzi-container"
 
 pipeline {
 
diff --git a/test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/StrimziContainer.java b/test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/StrimziContainer.java
index 6575d873b1fa..0961227681c3 100644
--- a/test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/StrimziContainer.java
+++ b/test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/StrimziContainer.java
@@ -58,8 +58,8 @@ public class StrimziContainer extends GenericContainer<StrimziContainer> {
                 .withNetwork(network)
                 .withCreateContainerCmdModifier(createContainerCmd -> setupContainer(name, createContainerCmd))
                 .withCommand("sh", "-c",
-                        "bin/kafka-storage.sh format -t " + clusterId + " -c config/kraft/server.properties && "
-                                         + "bin/kafka-server-start.sh config/kraft/server.properties "
+                        "bin/kafka-storage.sh format -t " + clusterId + " -c config/server.properties --standalone && "
+                                         + "bin/kafka-server-start.sh config/server.properties "
                                          + "--override listeners=${KAFKA_LISTENERS} "
                                          + "--override advertised.listeners=${KAFKA_ADVERTISED_LISTENERS} "
                                          + "--override listener.security.protocol.map=${KAFKA_LISTENER_SECURITY_PROTOCOL_MAP} "