Backport CAMEL-21576 + CAMEL-21585 to 4.4.x along w/ dependent/related code

components/camel-consul/pom.xml

@@ -157,31 +157,4 @@
         </dependency>
 
     </dependencies>
-
-    <profiles>
-        <profile>
-            <id>ppc64le</id>
-            <activation>
-                <os>
-                    <arch>ppc64le</arch>
-                </os>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <configuration>
-                            <skipITs>${skipTests}</skipITs>
-                            <reuseForks>true</reuseForks>
-                            <systemPropertyVariables>
-                                 <consul.container>icr.io/ppc64le-oss/consul-ppc64le:1.9.4</consul.container>
-                           </systemPropertyVariables>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
 </project>

components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedClusteredConsumerTest.java

@@ -26,9 +26,14 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
 
 import static org.junit.jupiter.api.Assertions.assertNull;
 
+@DisabledOnOs(value = { OS.LINUX },
+              architectures = { "s390x" },
+              disabledReason = "This test does not run reliably multiple platforms (see CAMEL-21438)")
 public class InfinispanEmbeddedClusteredConsumerTest extends InfinispanEmbeddedClusteredTestSupport {
 
     private static final long WAIT_TIMEOUT = 5000;

components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentTest.java

@@ -26,9 +26,14 @@
 import org.apache.camel.test.junit5.CamelTestSupport;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+@DisabledOnOs(value = { OS.LINUX },
+              architectures = { "s390x" },
+              disabledReason = "This test does not run reliably multiple platforms (see CAMEL-21438)")
 public class LumberjackComponentTest extends CamelTestSupport {
     private static int port;
 

components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackMultiThreadTest.java

@@ -29,11 +29,16 @@
 import org.awaitility.Awaitility;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
 import org.junit.jupiter.api.parallel.Isolated;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
 
+@DisabledOnOs(value = { OS.LINUX },
+              architectures = { "s390x" },
+              disabledReason = "This test does not run reliably multiple platforms (see CAMEL-21438)")
 @Isolated
 public class LumberjackMultiThreadTest extends CamelTestSupport {
 

components/camel-minio/pom.xml

@@ -32,6 +32,11 @@
     <name>Camel :: MinIO</name>
     <description>Store and retrieve objects from Minio Storage Service</description>
 
+    <properties>
+        <!-- Minio container is not available on s390x -->
+        <skipITs.s390x>true</skipITs.s390x>
+    </properties>
+
     <dependencies>
 
         <dependency>

components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbFindOperationIT.java

@@ -32,7 +32,6 @@
 import org.apache.camel.component.mongodb.MongoDbComponent;
 import org.apache.camel.component.mongodb.MongoDbConstants;
 import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.test.infra.mongodb.common.MongoDBProperties;
 import org.apache.camel.test.infra.mongodb.services.MongoDBLocalContainerService;
 import org.apache.camel.test.junit5.CamelTestSupport;
 import org.apache.camel.util.IOHelper;
@@ -63,19 +62,12 @@ public class MongoDbFindOperationIT extends CamelTestSupport {
     protected static String dbName = "test";
     protected static String testCollectionName;
 
-    private static String mongoDbContainer;
-
     private static MongoClient mongo;
     private static MongoDatabase db;
     private static MongoCollection<Document> testCollection;
 
     static {
-
-        // This one requires Mongo 4.4. This is related to
-        // "CAMEL-15604 support allowDiskUse for MongoDB find operations"
-        mongoDbContainer = System.getProperty(MongoDBProperties.MONGODB_CONTAINER, "mongo:4.4");
-
-        service = new MongoDBLocalContainerService(mongoDbContainer);
+        service = new MongoDBLocalContainerService();
 
         service.getContainer()
                 .waitingFor(Wait.forListeningPort())

components/camel-pg-replication-slot/src/test/java/org/apache/camel/component/pg/replication/slot/integration/PgReplicationITSupport.java

@@ -21,14 +21,17 @@
 import org.apache.camel.test.junit5.CamelTestSupport;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.testcontainers.containers.PostgreSQLContainer;
+import org.testcontainers.utility.DockerImageName;
 
 public class PgReplicationITSupport extends CamelTestSupport {
 
     @RegisterExtension
     static PostgresLocalContainerService service;
 
     static {
-        PostgreSQLContainer container = new PostgreSQLContainer<>(PostgresLocalContainerService.DEFAULT_POSTGRES_CONTAINER)
+        PostgreSQLContainer container = new PostgreSQLContainer<>(
+                DockerImageName.parse(PostgresLocalContainerService.DEFAULT_POSTGRES_CONTAINER)
+                        .asCompatibleSubstituteFor("postgres"))
                 .withDatabaseName("camel")
                 .withCommand("postgres -c wal_level=logical");
 

components/camel-pulsar/pom.xml

@@ -91,27 +91,4 @@
             <scope>test</scope>
     	</dependency>
     </dependencies>
-
-    <profiles>
-        <profile>
-            <id>full</id>
-            <activation>
-                <property>
-                    <name>!quickly</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <systemPropertyVariables>
-                                <pulsar.container>apachepulsar/pulsar:${pulsar-version}</pulsar.container>
-                            </systemPropertyVariables>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>

components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbComponentIT.java

@@ -27,10 +27,13 @@
 import org.apache.camel.test.infra.smb.services.SmbServiceFactory;
 import org.apache.camel.test.junit5.CamelTestSupport;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnOs;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@DisabledOnOs(architectures = { "s390x" },
+              disabledReason = "This test does not run reliably on s390x")
 public class SmbComponentIT extends CamelTestSupport {
     private static final Logger LOG = LoggerFactory.getLogger(SmbComponentIT.class);
 

components/camel-zookeeper-master/pom.xml

@@ -146,28 +146,5 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>ppc64le</id>
-            <activation>
-                <os>
-                    <arch>ppc64le</arch>
-                </os>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <configuration>
-                            <skipITs>${skipTests}</skipITs>
-                            <reuseForks>true</reuseForks>
-                            <systemPropertyVariables>
-                                 <zookeeper.container>icr.io/ppc64le-oss/zookeeper-ppc64le:3.5.10</zookeeper.container>
-                           </systemPropertyVariables>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
     </profiles>
 </project>

components/camel-zookeeper/pom.xml

@@ -198,29 +198,5 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>ppc64le</id>
-            <activation>
-                <os>
-                    <arch>ppc64le</arch>
-                </os>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <configuration>
-                            <skipITs>${skipTests}</skipITs>
-                            <reuseForks>true</reuseForks>
-                            <systemPropertyVariables>
-                                 <zookeeper.container>icr.io/ppc64le-oss/zookeeper-ppc64le:3.5.10</zookeeper.container>
-                           </systemPropertyVariables>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
     </profiles>
 </project>

core/camel-core/src/test/java/org/apache/camel/component/controlbus/ControlBusFailRouteTest.java

@@ -24,10 +24,13 @@
 import org.apache.camel.spi.RouteError;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnOs;
 
 import static org.awaitility.Awaitility.await;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+@DisabledOnOs(architectures = { "s390x" },
+              disabledReason = "This test does not run reliably on s390x")
 public class ControlBusFailRouteTest extends ContextTestSupport {
 
     @Test

core/camel-core/src/test/java/org/apache/camel/component/file/FileSortByIgnoreCaseExpressionTest.java

@@ -21,10 +21,15 @@
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
 
 /**
  * Unit test for the file sort by expression
  */
+@DisabledOnOs(value = { OS.LINUX },
+              architectures = { "ppc64le" },
+              disabledReason = "This test does not run reliably multiple platforms (see CAMEL-21438)")
 public class FileSortByIgnoreCaseExpressionTest extends ContextTestSupport {
 
     private void prepareFolder(String folder) {

core/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelTimeoutStreamCachingTest.java

@@ -29,13 +29,19 @@
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.converter.stream.CachedOutputStream;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
+import org.junit.jupiter.api.condition.DisabledOnOs;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  *
  */
+@DisabledIfSystemProperty(named = "ci.env.name", matches = "github.com", disabledReason = "Flaky on Github CI")
+@DisabledOnOs(architectures = { "s390x" },
+              disabledReason = "This test does not run reliably on s390x")
 public class MulticastParallelTimeoutStreamCachingTest extends ContextTestSupport {
 
     private static final String BODY_STRING = "message body";
@@ -52,6 +58,7 @@ public void testCreateOutputStreamCacheAfterTimeout() throws Exception {
         assertTrue(f.isDirectory());
         Thread.sleep(500L); // deletion happens asynchron
         File[] files = f.listFiles();
+        assertNotNull(files, "There should be a list of files");
         assertEquals(0, files.length);
     }
 

core/camel-core/src/test/java/org/apache/camel/processor/ResequenceBatchNotIgnoreInvalidExchangesTest.java

@@ -17,10 +17,12 @@
 package org.apache.camel.processor;
 
 import org.apache.camel.builder.RouteBuilder;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
 
-/**
- *
- */
+@DisabledOnOs(value = { OS.LINUX },
+              architectures = { "s390x" },
+              disabledReason = "This test does not run reliably multiple platforms (see CAMEL-21438)")
 public class ResequenceBatchNotIgnoreInvalidExchangesTest extends ResequenceStreamNotIgnoreInvalidExchangesTest {
 
     @Override

core/camel-core/src/test/java/org/apache/camel/processor/ResequenceStreamRejectOldExchangesTest.java

@@ -20,10 +20,12 @@
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.processor.resequencer.MessageRejectedException;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
 
-/**
- *
- */
+@DisabledOnOs(value = { OS.LINUX },
+              architectures = { "s390x" },
+              disabledReason = "This test does not run reliably multiple platforms (see CAMEL-21438)")
 public class ResequenceStreamRejectOldExchangesTest extends ContextTestSupport {
 
     @Test

core/camel-core/src/test/java/org/apache/camel/processor/StreamResequencerTest.java

@@ -32,9 +32,14 @@
 import org.apache.camel.processor.errorhandler.DefaultErrorHandler;
 import org.apache.camel.support.service.ServiceHelper;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+@DisabledOnOs(value = { OS.LINUX },
+              architectures = { "s390x" },
+              disabledReason = "This test does not run reliably multiple platforms (see CAMEL-21438)")
 public class StreamResequencerTest extends ContextTestSupport {
 
     protected void sendBodyAndHeader(String endpointUri, final Object body, final String headerName, final Object headerValue) {

core/camel-core/src/test/java/org/apache/camel/processor/ThreadsRejectedExecutionTest.java

@@ -27,10 +27,15 @@
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+@DisabledOnOs(value = { OS.LINUX },
+              architectures = { "s390x" },
+              disabledReason = "This test does not run reliably multiple platforms (see CAMEL-21438)")
 public class ThreadsRejectedExecutionTest extends ContextTestSupport {
 
     @Override

test-infra/camel-test-infra-arangodb/src/test/resources/org/apache/camel/test/infra/arangodb/services/container.properties

@@ -15,4 +15,4 @@
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
 ## tested against 2.1.2, 2.2.0 & 2.3.1
-arangodb.container=arangodb:3.11.5
+arangodb.container=mirror.gcr.io/arangodb:3.11.5

test-infra/camel-test-infra-aws-v2/src/test/resources/org/apache/camel/test/infra/aws2/services/container.properties

@@ -15,4 +15,4 @@
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
 
-aws.container=localstack/localstack:3.1.0
+aws.container=mirror.gcr.io/localstack/localstack:3.1.0

test-infra/camel-test-infra-cassandra/src/test/java/org/apache/camel/test/infra/cassandra/services/CassandraLocalContainerService.java

@@ -22,6 +22,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.CassandraContainer;
+import org.testcontainers.utility.DockerImageName;
 
 /**
  * A service for a local instance of Apache Cassandra running with TestContainers
@@ -46,7 +47,7 @@ public CassandraLocalContainerService(CassandraContainer container) {
     }
 
     protected CassandraContainer initContainer(String imageName) {
-        return new CassandraContainer(imageName);
+        return new CassandraContainer(DockerImageName.parse(imageName).asCompatibleSubstituteFor("cassandra"));
     }
 
     @Override

test-infra/camel-test-infra-cassandra/src/test/resources/org/apache/camel/test/infra/cassandra/services/container.properties

@@ -15,4 +15,4 @@
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
 ## tested against 2.1.2, 2.2.0 & 2.3.1
-cassandra.container=cassandra:4.1.3
+cassandra.container=mirror.gcr.io/cassandra:4.1.5