You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/10/27 07:27:28 UTC
[camel] branch main updated: [kafka] Add infra property for custom image (#11845)
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 088749539be [kafka] Add infra property for custom image (#11845)
088749539be is described below
commit 088749539be66a554b5b640cf47846c6e133d347
Author: Salvatore Mongiardo <sm...@redhat.com>
AuthorDate: Fri Oct 27 09:27:22 2023 +0200
[kafka] Add infra property for custom image (#11845)
---
.../apache/camel/test/infra/kafka/common/KafkaProperties.java | 1 +
.../infra/kafka/services/ContainerLocalAuthKafkaService.java | 2 +-
.../test/infra/kafka/services/ContainerLocalKafkaService.java | 9 ++++++---
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/common/KafkaProperties.java b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/common/KafkaProperties.java
index f39a1edcb4e..725ae3cb24e 100644
--- a/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/common/KafkaProperties.java
+++ b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/common/KafkaProperties.java
@@ -20,6 +20,7 @@ package org.apache.camel.test.infra.kafka.common;
public final class KafkaProperties {
public static final String KAFKA_BOOTSTRAP_SERVERS = "kafka.bootstrap.servers";
public static final String KAFKA_ZOOKEEPER_ADDRESS = "kafka.zookeeper.address";
+ public static final String KAFKA_CONTAINER = "kafka.container";
private KafkaProperties() {
diff --git a/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/ContainerLocalAuthKafkaService.java b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/ContainerLocalAuthKafkaService.java
index 67cfedec89e..5ea3ccdbada 100644
--- a/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/ContainerLocalAuthKafkaService.java
+++ b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/ContainerLocalAuthKafkaService.java
@@ -31,7 +31,7 @@ public class ContainerLocalAuthKafkaService implements KafkaService, ContainerSe
public static class TransientAuthenticatedKafkaContainer extends KafkaContainer {
public TransientAuthenticatedKafkaContainer(String jaasConfigFile) {
- super(DockerImageName.parse(ContainerLocalKafkaService.KAFKA3_IMAGE_NAME));
+ super(DockerImageName.parse(System.getProperty("kafka.container", ContainerLocalKafkaService.KAFKA3_IMAGE_NAME)).asCompatibleSubstituteFor(ContainerLocalKafkaService.KAFKA3_IMAGE_NAME));
withEmbeddedZookeeper();
diff --git a/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/ContainerLocalKafkaService.java b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/ContainerLocalKafkaService.java
index 4943ac0a0bc..67108bb3a6b 100644
--- a/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/ContainerLocalKafkaService.java
+++ b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/ContainerLocalKafkaService.java
@@ -40,7 +40,8 @@ public class ContainerLocalKafkaService implements KafkaService, ContainerServic
}
protected KafkaContainer initContainer() {
- return new KafkaContainer(DockerImageName.parse(KAFKA3_IMAGE_NAME)).withEmbeddedZookeeper();
+ return new KafkaContainer(DockerImageName.parse(System.getProperty("kafka.container", KAFKA3_IMAGE_NAME)))
+ .withEmbeddedZookeeper();
}
public String getBootstrapServers() {
@@ -71,14 +72,16 @@ public class ContainerLocalKafkaService implements KafkaService, ContainerServic
}
public static ContainerLocalKafkaService kafka2Container() {
- KafkaContainer container = new KafkaContainer(DockerImageName.parse(KAFKA2_IMAGE_NAME));
+ KafkaContainer container
+ = new KafkaContainer(DockerImageName.parse(System.getProperty("kafka.container", KAFKA2_IMAGE_NAME)).asCompatibleSubstituteFor(ContainerLocalKafkaService.KAFKA2_IMAGE_NAME));
container = container.withEmbeddedZookeeper();
return new ContainerLocalKafkaService(container);
}
public static ContainerLocalKafkaService kafka3Container() {
- KafkaContainer container = new KafkaContainer(DockerImageName.parse(KAFKA3_IMAGE_NAME));
+ KafkaContainer container
+ = new KafkaContainer(DockerImageName.parse(System.getProperty("kafka.container", KAFKA3_IMAGE_NAME)).asCompatibleSubstituteFor(ContainerLocalKafkaService.KAFKA3_IMAGE_NAME));
container = container.withEmbeddedZookeeper();
return new ContainerLocalKafkaService(container);