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 dde6cfc6bdc Revert open search ppc64 le not working (#15946)
dde6cfc6bdc is described below
commit dde6cfc6bdc92f105d6b9cc97866b37a19b11b9a
Author: Aurélien Pupier <[email protected]>
AuthorDate: Mon Oct 14 15:42:18 2024 +0200
Revert open search ppc64 le not working (#15946)
* Revert "CAMEL-21334 - use specific ppc64le container image for OpenSearch
(#15923)"
This reverts commit 5e6faa2219ec460c534442d9d5ef37583ebd197b.
* Revert "Enable opensearch on ppc64le (#15895)"
This reverts commit 60db2f22af6ab66c9697eb1744ffd57f2e9e04a2.
---
components/camel-opensearch/pom.xml | 1 +
.../infra/opensearch/common/OpenSearchProperties.java | 1 -
.../services/OpenSearchLocalContainerService.java | 16 ++--------------
.../test/infra/opensearch/services/container.properties | 1 -
4 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/components/camel-opensearch/pom.xml
b/components/camel-opensearch/pom.xml
index 7e79a43367a..1cdaf79ae93 100644
--- a/components/camel-opensearch/pom.xml
+++ b/components/camel-opensearch/pom.xml
@@ -34,6 +34,7 @@
<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/common/OpenSearchProperties.java
b/test-infra/camel-test-infra-opensearch/src/test/java/org/apache/camel/test/infra/opensearch/common/OpenSearchProperties.java
index 6e2fb94e56a..03bca15e2ad 100644
---
a/test-infra/camel-test-infra-opensearch/src/test/java/org/apache/camel/test/infra/opensearch/common/OpenSearchProperties.java
+++
b/test-infra/camel-test-infra-opensearch/src/test/java/org/apache/camel/test/infra/opensearch/common/OpenSearchProperties.java
@@ -25,7 +25,6 @@ public final class OpenSearchProperties {
public static final String OPEN_SEARCH_USERNAME = "opensearch.username";
public static final String OPEN_SEARCH_PASSWORD = "opensearch.password";
public static final String OPEN_SEARCH_CONTAINER = "opensearch.container";
- public static final String OPEN_SEARCH_CONTAINER_PPC64LE =
"opensearch.container.ppc64le";
public static final String OPEN_SEARCH_CONTAINER_STARTUP
= OPEN_SEARCH_CONTAINER +
ContainerEnvironmentUtil.STARTUP_ATTEMPTS_PROPERTY;
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 8d136074e2e..f572c629355 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,8 +28,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.output.Slf4jLogConsumer;
import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
-import org.testcontainers.shaded.org.apache.commons.lang3.SystemUtils;
-import org.testcontainers.utility.DockerImageName;
public class OpenSearchLocalContainerService implements OpenSearchService,
ContainerService<OpensearchContainer> {
private static final Logger LOG =
LoggerFactory.getLogger(OpenSearchLocalContainerService.class);
@@ -40,15 +38,7 @@ public class OpenSearchLocalContainerService implements
OpenSearchService, Conta
public OpenSearchLocalContainerService() {
this(LocalPropertyResolver.getProperty(OpenSearchLocalContainerService.class,
- getPropertyKeyForContainerImage()));
- }
-
- private static String getPropertyKeyForContainerImage() {
- if (SystemUtils.OS_ARCH == "ppc64le") {
- return OpenSearchProperties.OPEN_SEARCH_CONTAINER_PPC64LE;
- } else {
- return OpenSearchProperties.OPEN_SEARCH_CONTAINER;
- }
+ OpenSearchProperties.OPEN_SEARCH_CONTAINER));
}
public OpenSearchLocalContainerService(String imageName) {
@@ -60,9 +50,7 @@ public class OpenSearchLocalContainerService implements
OpenSearchService, Conta
}
protected OpensearchContainer initContainer(String imageName) {
- DockerImageName customImage = DockerImageName.parse(imageName)
- .asCompatibleSubstituteFor("opensearchproject/opensearch");
- OpensearchContainer opensearchContainer = new
OpensearchContainer(customImage);
+ OpensearchContainer opensearchContainer = new
OpensearchContainer(imageName);
// Increase the timeout from 60 seconds to 90 seconds to ensure that
it will be long enough
// on the build pipeline
opensearchContainer.setWaitStrategy(
diff --git
a/test-infra/camel-test-infra-opensearch/src/test/resources/org/apache/camel/test/infra/opensearch/services/container.properties
b/test-infra/camel-test-infra-opensearch/src/test/resources/org/apache/camel/test/infra/opensearch/services/container.properties
index 00026c7d689..1ad5a3829aa 100644
---
a/test-infra/camel-test-infra-opensearch/src/test/resources/org/apache/camel/test/infra/opensearch/services/container.properties
+++
b/test-infra/camel-test-infra-opensearch/src/test/resources/org/apache/camel/test/infra/opensearch/services/container.properties
@@ -15,4 +15,3 @@
## limitations under the License.
## ---------------------------------------------------------------------------
opensearch.container=opensearchproject/opensearch:2.14.0
-opensearch.container.ppc64le=icr.io/ppc64le-oss/opensearch-ppc64le:2.12.0
