You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2024/10/09 10:13:31 UTC
(camel) branch main updated: Enable opensearch on ppc64le (#15895)
This is an automated email from the ASF dual-hosted git repository.
acosentino 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 60db2f22af6 Enable opensearch on ppc64le (#15895)
60db2f22af6 is described below
commit 60db2f22af6ab66c9697eb1744ffd57f2e9e04a2
Author: anushkajuli <an...@ibm.com>
AuthorDate: Wed Oct 9 15:43:24 2024 +0530
Enable opensearch on ppc64le (#15895)
Co-authored-by: anushkajuli <an...@ibm.com>
---
components/camel-opensearch/pom.xml | 1 -
.../infra/opensearch/services/OpenSearchLocalContainerService.java | 5 ++++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/components/camel-opensearch/pom.xml b/components/camel-opensearch/pom.xml
index 1cdaf79ae93..7e79a43367a 100644
--- a/components/camel-opensearch/pom.xml
+++ b/components/camel-opensearch/pom.xml
@@ -34,7 +34,6 @@
<properties>
<!-- OpenSearch container is not available on these platforms -->
- <skipITs.ppc64le>true</skipITs.ppc64le>
<skipITs.s390x>true</skipITs.s390x>
<camel.surefire.reuseForks>true</camel.surefire.reuseForks>
diff --git a/test-infra/camel-test-infra-opensearch/src/test/java/org/apache/camel/test/infra/opensearch/services/OpenSearchLocalContainerService.java b/test-infra/camel-test-infra-opensearch/src/test/java/org/apache/camel/test/infra/opensearch/services/OpenSearchLocalContainerService.java
index f572c629355..69409d69cfd 100644
--- a/test-infra/camel-test-infra-opensearch/src/test/java/org/apache/camel/test/infra/opensearch/services/OpenSearchLocalContainerService.java
+++ b/test-infra/camel-test-infra-opensearch/src/test/java/org/apache/camel/test/infra/opensearch/services/OpenSearchLocalContainerService.java
@@ -28,6 +28,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.output.Slf4jLogConsumer;
import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.utility.DockerImageName;
public class OpenSearchLocalContainerService implements OpenSearchService, ContainerService<OpensearchContainer> {
private static final Logger LOG = LoggerFactory.getLogger(OpenSearchLocalContainerService.class);
@@ -50,7 +51,9 @@ public class OpenSearchLocalContainerService implements OpenSearchService, Conta
}
protected OpensearchContainer initContainer(String imageName) {
- OpensearchContainer opensearchContainer = new OpensearchContainer(imageName);
+ DockerImageName customImage = DockerImageName.parse(imageName)
+ .asCompatibleSubstituteFor("opensearchproject/opensearch");
+ OpensearchContainer opensearchContainer = new OpensearchContainer(customImage);
// Increase the timeout from 60 seconds to 90 seconds to ensure that it will be long enough
// on the build pipeline
opensearchContainer.setWaitStrategy(