(camel) branch main updated: milvus ppc64le integration tests activation (#16624)

[acosentino]

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 ac3894ed31a milvus ppc64le integration tests activation (#16624)
ac3894ed31a is described below

commit ac3894ed31a217beef4cedceceedc77f702d1355
Author: RadhikaAjabe7 <radhika.aj...@ibm.com>
AuthorDate: Fri Dec 20 15:58:07 2024 +0530

    milvus ppc64le integration tests activation (#16624)
---
 components/camel-ai/camel-milvus/pom.xml                    |  2 --
 .../camel/test/infra/milvus/common/MilvusProperties.java    |  1 +
 .../infra/milvus/services/MilvusLocalContainerService.java  | 13 +++++++++++--
 .../camel/test/infra/milvus/services/container.properties   |  1 +
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/components/camel-ai/camel-milvus/pom.xml 
b/components/camel-ai/camel-milvus/pom.xml
index 8d0ae6d1140..652bfd813c8 100644
--- a/components/camel-ai/camel-milvus/pom.xml
+++ b/components/camel-ai/camel-milvus/pom.xml
@@ -37,9 +37,7 @@
         <camel.surefire.parallel.factor>4</camel.surefire.parallel.factor>
 
         <!-- Milvus is not available on these platforms -->
-        <skipITs.ppc64le>true</skipITs.ppc64le>
         <skipITs.s390x>true</skipITs.s390x>
-        <skipTests.ppc64le>true</skipTests.ppc64le>
         <skipTests.s390x>true</skipTests.s390x>
     </properties>
 
diff --git 
a/test-infra/camel-test-infra-milvus/src/test/java/org/apache/camel/test/infra/milvus/common/MilvusProperties.java
 
b/test-infra/camel-test-infra-milvus/src/test/java/org/apache/camel/test/infra/milvus/common/MilvusProperties.java
index 745053d6343..1742be61fc0 100644
--- 
a/test-infra/camel-test-infra-milvus/src/test/java/org/apache/camel/test/infra/milvus/common/MilvusProperties.java
+++ 
b/test-infra/camel-test-infra-milvus/src/test/java/org/apache/camel/test/infra/milvus/common/MilvusProperties.java
@@ -24,6 +24,7 @@ public final class MilvusProperties {
 
     public static final String MILVUS_ENDPOINT_PORT = "milvus.endpoint.port";
     public static final String MILVUS_CONTAINER = "milvus.container";
+    public static final String MILVUS_CONTAINER_PPC64LE = 
"milvus.container.ppc64le";
 
     private MilvusProperties() {
 
diff --git 
a/test-infra/camel-test-infra-milvus/src/test/java/org/apache/camel/test/infra/milvus/services/MilvusLocalContainerService.java
 
b/test-infra/camel-test-infra-milvus/src/test/java/org/apache/camel/test/infra/milvus/services/MilvusLocalContainerService.java
index 2003351895c..18626bba209 100644
--- 
a/test-infra/camel-test-infra-milvus/src/test/java/org/apache/camel/test/infra/milvus/services/MilvusLocalContainerService.java
+++ 
b/test-infra/camel-test-infra-milvus/src/test/java/org/apache/camel/test/infra/milvus/services/MilvusLocalContainerService.java
@@ -26,6 +26,7 @@ import 
org.apache.camel.test.infra.milvus.common.MilvusProperties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.milvus.MilvusContainer;
+import org.testcontainers.shaded.org.apache.commons.lang3.SystemUtils;
 import org.testcontainers.utility.DockerImageName;
 
 public class MilvusLocalContainerService implements MilvusService, 
ContainerService<MilvusContainer> {
@@ -35,7 +36,15 @@ public class MilvusLocalContainerService implements 
MilvusService, ContainerServ
     private final MilvusContainer container;
 
     public MilvusLocalContainerService() {
-        
this(LocalPropertyResolver.getProperty(MilvusLocalContainerService.class, 
MilvusProperties.MILVUS_CONTAINER));
+        
this(LocalPropertyResolver.getProperty(MilvusLocalContainerService.class, 
getPropertyKeyForContainerImage()));
+    }
+
+    private static String getPropertyKeyForContainerImage() {
+        if ("ppc64le".equals(SystemUtils.OS_ARCH)) {
+            return MilvusProperties.MILVUS_CONTAINER_PPC64LE;
+        } else {
+            return MilvusProperties.MILVUS_CONTAINER;
+        }
     }
 
     public MilvusLocalContainerService(String imageName) {
@@ -47,7 +56,7 @@ public class MilvusLocalContainerService implements 
MilvusService, ContainerServ
     }
 
     protected MilvusContainer initContainer(String imageName) {
-        return new MilvusContainer(DockerImageName.parse(imageName))
+        return new 
MilvusContainer(DockerImageName.parse(imageName).asCompatibleSubstituteFor("milvusdb/milvus"))
                 .withStartupTimeout(Duration.ofMinutes(3L));
     }
 
diff --git 
a/test-infra/camel-test-infra-milvus/src/test/resources/org/apache/camel/test/infra/milvus/services/container.properties
 
b/test-infra/camel-test-infra-milvus/src/test/resources/org/apache/camel/test/infra/milvus/services/container.properties
index 761be677ba7..625c4e0ca93 100644
--- 
a/test-infra/camel-test-infra-milvus/src/test/resources/org/apache/camel/test/infra/milvus/services/container.properties
+++ 
b/test-infra/camel-test-infra-milvus/src/test/resources/org/apache/camel/test/infra/milvus/services/container.properties
@@ -15,3 +15,4 @@
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
 milvus.container=milvusdb/milvus:v2.4.5
+milvus.container.ppc64le=icr.io/ppc64le-oss/milvus-ppc64le:v2.4.11