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 2bacc393cf92891f0ff4d2b49cd260dadd0bae72 Author: Otavio Rodolfo Piske <[email protected]> AuthorDate: Mon May 15 14:04:41 2023 +0200 (chores) camel-zookeeper-master: cleanup disabling tests on platforms where it's not available --- Jenkinsfile.ppc64le | 2 +- Jenkinsfile.s390x | 2 +- components/camel-zookeeper-master/pom.xml | 29 ++++++++++++++++++++++ .../group/{GroupTest.java => GroupIT.java} | 4 +-- 4 files changed, 33 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile.ppc64le b/Jenkinsfile.ppc64le index ba2699f7492..87e12098bef 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-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'" } } post { diff --git a/Jenkinsfile.s390x b/Jenkinsfile.s390x index faab2ccc956..14960e84bb7 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-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-salesforce/camel-salesforce-component'" } } post { diff --git a/components/camel-zookeeper-master/pom.xml b/components/camel-zookeeper-master/pom.xml index 83bc67d96e5..47c7f642ba2 100644 --- a/components/camel-zookeeper-master/pom.xml +++ b/components/camel-zookeeper-master/pom.xml @@ -150,4 +150,33 @@ </plugins> </build> + <profiles> + <profile> + <!-- Zookeeper master tests only run on x86 64 or ARM--> + <id>Notx86</id> + <activation> + <os> + <arch>!amd64</arch> + </os> + </activation> + <properties> + <skipTests>true</skipTests> + <skipITs>true</skipITs> + </properties> + </profile> + <profile> + <!-- Zookeeper master tests only run on x86 64 or ARM--> + <id>NotARM</id> + <activation> + <os> + <arch>!aarch64</arch> + </os> + </activation> + <properties> + <skipTests>true</skipTests> + <skipITs>true</skipITs> + </properties> + </profile> + </profiles> + </project> diff --git a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/GroupTest.java b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/GroupIT.java similarity index 99% rename from components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/GroupTest.java rename to components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/GroupIT.java index 215063906b2..3d207422bf6 100644 --- a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/GroupTest.java +++ b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/GroupIT.java @@ -46,8 +46,8 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @ExtendWith(ZookeeprContainer.class) -public class GroupTest { - private static final Logger LOGGER = LoggerFactory.getLogger(GroupTest.class); +public class GroupIT { + private static final Logger LOGGER = LoggerFactory.getLogger(GroupIT.class); private static String beforeTmpdir;
