You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2023/02/17 11:14:22 UTC
[camel] branch CAMEL-19070/increase-startup-timeout created (now e8c6df7a16b)
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a change to branch CAMEL-19070/increase-startup-timeout
in repository https://gitbox.apache.org/repos/asf/camel.git
at e8c6df7a16b CAMEL-19070: camel-elasticsearch - Increase startup timeout for slow build pipelines
This branch includes the following new commits:
new b00a904e8f0 CAMEL-19070: camel-elasticsearch - Upgrade elasticsearch to 8.6.2
new e8c6df7a16b CAMEL-19070: camel-elasticsearch - Increase startup timeout for slow build pipelines
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[camel] 02/02: CAMEL-19070: camel-elasticsearch - Increase startup timeout for slow build pipelines
Posted by nf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch CAMEL-19070/increase-startup-timeout
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e8c6df7a16b8bc976e4d099e7dc485cd5b8fa23e
Author: Nicolas Filotto <nf...@talend.com>
AuthorDate: Fri Feb 17 12:13:55 2023 +0100
CAMEL-19070: camel-elasticsearch - Increase startup timeout for slow build pipelines
---
.../component/es/integration/ElasticsearchTestSupport.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
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 9992aeecc38..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)
@@ -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;
}
[camel] 01/02: CAMEL-19070: camel-elasticsearch - Upgrade elasticsearch to 8.6.2
Posted by nf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch CAMEL-19070/increase-startup-timeout
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b00a904e8f0e68329c0461107c7be0fab6ff0fbb
Author: Nicolas Filotto <nf...@talend.com>
AuthorDate: Fri Feb 17 12:09:40 2023 +0100
CAMEL-19070: camel-elasticsearch - Upgrade elasticsearch to 8.6.2
---
camel-dependencies/pom.xml | 4 ++--
.../camel/component/es/integration/ElasticsearchTestSupport.java | 2 +-
parent/pom.xml | 4 ++--
3 files changed, 5 insertions(+), 5 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..9992aeecc38 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
@@ -69,7 +69,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();
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>