This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8b0d14eb7321e0af4697af95607d4cb834d39ce2 Author: Otavio Rodolfo Piske <[email protected]> AuthorDate: Mon May 15 13:59:56 2023 +0200 (chores) camel-zookeeper: cleanup disabling tests on platforms where it's not available --- Jenkinsfile.ppc64le | 2 +- Jenkinsfile.s390x | 2 +- components/camel-zookeeper/pom.xml | 27 ++++++++++++++++++++++ ...ingZooKeeperClusteredRouteConfigurationIT.java} | 2 +- 4 files changed, 30 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile.ppc64le b/Jenkinsfile.ppc64le index b79a1d12d4b..ba2699f7492 100644 --- a/Jenkinsfile.ppc64le +++ b/Jenkinsfile.ppc64le @@ -85,7 +85,7 @@ pipeline { steps { timeout(unit: 'HOURS', time: 7) { // Skip the test case execution of modules which are either not supported on ppc64le or vendor images are not available for ppc64le. - sh "./mvnw $MAVEN_PARAMS $MAVEN_TEST_PARAMS $MAVEN_TEST_LIMIT_PARAMS -Darchetype.test.skip -Dmaven.test.failure.ignore=true -Dcheckstyle.skip=true verify -pl '!docs,!components/camel-zookeeper,!components/camel-zookeeper-master'" + sh "./mvnw $MAVEN_PARAMS $MAVEN_TEST_PARAMS $MAVEN_TEST_LIMIT_PARAMS -Darchetype.test.skip -Dmaven.test.failure.ignore=true -Dcheckstyle.skip=true verify -pl '!docs,!components/camel-zookeeper-master'" } } post { diff --git a/Jenkinsfile.s390x b/Jenkinsfile.s390x index a1734eac097..faab2ccc956 100644 --- a/Jenkinsfile.s390x +++ b/Jenkinsfile.s390x @@ -85,7 +85,7 @@ pipeline { steps { timeout(unit: 'HOURS', time: 7) { // Skip the test case execution of modules which are either not supported on s390x or vendor images are not available for s390x. - sh "./mvnw $MAVEN_PARAMS $MAVEN_TEST_PARAMS $MAVEN_TEST_LIMIT_PARAMS -Darchetype.test.skip -Dmaven.test.failure.ignore=true -Dcheckstyle.skip=true verify -pl '!docs,!components/camel-kudu,!components/camel-djl,!components/camel-consul,!components/camel-pulsar,!components/camel-xmpp,!components/camel-google/camel-google-pubsub,!components/camel-hdfs,!components/camel-zookeeper,!components/camel-zookeeper-master, !components/camel-salesforce/camel-salesforce-component'" + sh "./mvnw $MAVEN_PARAMS $MAVEN_TEST_PARAMS $MAVEN_TEST_LIMIT_PARAMS -Darchetype.test.skip -Dmaven.test.failure.ignore=true -Dcheckstyle.skip=true verify -pl '!docs,!components/camel-kudu,!components/camel-djl,!components/camel-consul,!components/camel-pulsar,!components/camel-xmpp,!components/camel-google/camel-google-pubsub,!components/camel-hdfs,!components/camel-zookeeper-master,!components/camel-salesforce/camel-salesforce-component'" } } post { diff --git a/components/camel-zookeeper/pom.xml b/components/camel-zookeeper/pom.xml index 19be6e57c7c..bc0736038fa 100644 --- a/components/camel-zookeeper/pom.xml +++ b/components/camel-zookeeper/pom.xml @@ -210,4 +210,31 @@ </plugins> </build> + <profiles> + <profile> + <!-- Zookeeper container is only available for on x86 64 or ARM--> + <id>Notx86</id> + <activation> + <os> + <arch>!amd64</arch> + </os> + </activation> + <properties> + <skipITs>true</skipITs> + </properties> + </profile> + <profile> + <!-- XMPP container is only available for on x86 64 or ARM--> + <id>NotARM</id> + <activation> + <os> + <arch>!aarch64</arch> + </os> + </activation> + <properties> + <skipITs>true</skipITs> + </properties> + </profile> + </profiles> + </project> diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/SpringZooKeeperClusteredRouteConfigurationTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/SpringZooKeeperClusteredRouteConfigurationIT.java similarity index 95% rename from components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/SpringZooKeeperClusteredRouteConfigurationTest.java rename to components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/SpringZooKeeperClusteredRouteConfigurationIT.java index d3726aa8d6e..1838781e15e 100644 --- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/SpringZooKeeperClusteredRouteConfigurationTest.java +++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/SpringZooKeeperClusteredRouteConfigurationIT.java @@ -26,7 +26,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -public class SpringZooKeeperClusteredRouteConfigurationTest extends CamelSpringTestSupport { +public class SpringZooKeeperClusteredRouteConfigurationIT extends CamelSpringTestSupport { @Test public void test() {
