This is an automated email from the ASF dual-hosted git repository.
nfilotto 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 70f7ba19909 CAMEL-19070: camel-elasticsearch - Increase startup
timeout (#9372)
70f7ba19909 is described below
commit 70f7ba19909a2abb43a3fe4a82b47e7f518e23fa
Author: Nicolas Filotto <[email protected]>
AuthorDate: Fri Feb 17 13:28:44 2023 +0100
CAMEL-19070: camel-elasticsearch - Increase startup timeout (#9372)
Fix for https://issues.apache.org/jira/browse/CAMEL-19070
## Motivation
The integration tests of the component `camel-elasticsearch` fail on the
build pipeline and need to be fixed.
## Modifications:
* Upgrade elasticsearch (server and client) to the latest version
* Increase the startup timeout from 60 seconds to 90 seconds to fit with a
slow-build pipeline
---
camel-dependencies/pom.xml | 4 ++--
.../component/es/integration/ElasticsearchTestSupport.java | 12 ++++++++++--
parent/pom.xml | 4 ++--
3 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 200c2179a4f..ab2b7c1071a 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -144,8 +144,8 @@
<eddsa-version>0.3.0</eddsa-version>
<egit-github-core-version>2.1.5</egit-github-core-version>
<ehcache3-version>3.10.8</ehcache3-version>
-
<elasticsearch-java-client-version>8.5.2</elasticsearch-java-client-version>
-
<elasticsearch-java-client-sniffer-version>8.5.2</elasticsearch-java-client-sniffer-version>
+
<elasticsearch-java-client-version>8.6.2</elasticsearch-java-client-version>
+
<elasticsearch-java-client-sniffer-version>8.6.2</elasticsearch-java-client-sniffer-version>
<elasticsearch-rest-sniffer-version>7.10.2</elasticsearch-rest-sniffer-version>
<elasticsearch-rest-version>7.10.2</elasticsearch-rest-version>
<elytron-web>1.10.2.Final</elytron-web>
diff --git
a/components/camel-elasticsearch/src/test/java/org/apache/camel/component/es/integration/ElasticsearchTestSupport.java
b/components/camel-elasticsearch/src/test/java/org/apache/camel/component/es/integration/ElasticsearchTestSupport.java
index efe8664c075..5d8377a6348 100644
---
a/components/camel-elasticsearch/src/test/java/org/apache/camel/component/es/integration/ElasticsearchTestSupport.java
+++
b/components/camel-elasticsearch/src/test/java/org/apache/camel/component/es/integration/ElasticsearchTestSupport.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.es.integration;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
+import java.time.Duration;
import java.util.HashMap;
import java.util.Map;
@@ -44,6 +45,7 @@ import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
import org.testcontainers.utility.Base58;
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
@@ -69,7 +71,7 @@ public class ElasticsearchTestSupport extends
CamelTestSupport {
private static ElasticSearchLocalContainerService
createElasticSearchService() {
ElasticSearchLocalContainerService ret
- = new
ElasticSearchLocalContainerService("docker.elastic.co/elasticsearch/elasticsearch:8.4.1")
{
+ = new
ElasticSearchLocalContainerService("docker.elastic.co/elasticsearch/elasticsearch:8.6.2")
{
@Override
public void registerProperties() {
super.registerProperties();
@@ -88,7 +90,13 @@ public class ElasticsearchTestSupport extends
CamelTestSupport {
ret.getContainer()
.withNetworkAliases("elasticsearch-" + Base58.randomString(6))
.withPassword(PASSWORD)
- .withExposedPorts(ELASTICSEARCH_DEFAULT_PORT,
ELASTICSEARCH_DEFAULT_TCP_PORT);
+ .withExposedPorts(ELASTICSEARCH_DEFAULT_PORT,
ELASTICSEARCH_DEFAULT_TCP_PORT)
+ // Increase the timeout from 60 seconds to 90 seconds to
ensure that it will be long enough
+ // on the build pipeline
+ .setWaitStrategy(
+ new LogMessageWaitStrategy()
+
.withRegEx(".*(\"message\":\\s?\"started[\\s?|\"].*|] started\n$)")
+ .withStartupTimeout(Duration.ofSeconds(90)));
return ret;
}
diff --git a/parent/pom.xml b/parent/pom.xml
index 084b169d41a..4c154061e81 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -139,8 +139,8 @@
<eddsa-version>0.3.0</eddsa-version>
<egit-github-core-version>2.1.5</egit-github-core-version>
<ehcache3-version>3.10.8</ehcache3-version>
-
<elasticsearch-java-client-version>8.5.2</elasticsearch-java-client-version>
-
<elasticsearch-java-client-sniffer-version>8.5.2</elasticsearch-java-client-sniffer-version>
+
<elasticsearch-java-client-version>8.6.2</elasticsearch-java-client-version>
+
<elasticsearch-java-client-sniffer-version>8.6.2</elasticsearch-java-client-sniffer-version>
<elasticsearch-rest-sniffer-version>7.10.2</elasticsearch-rest-sniffer-version>
<elasticsearch-rest-version>7.10.2</elasticsearch-rest-version>
<elytron-web>1.10.2.Final</elytron-web>
