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 5d9e7b6e2a39bf52b2ffde3a8b1dbfa981c45c60
Author: Otavio Rodolfo Piske <[email protected]>
AuthorDate: Mon May 15 12:34:55 2023 +0200

    (chores) camel-kudu: cleanup disabling tests on platforms where it's not 
available
---
 Jenkinsfile.ppc64le           |  2 +-
 Jenkinsfile.s390x             |  2 +-
 components/camel-kudu/pom.xml | 13 +++++++------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Jenkinsfile.ppc64le b/Jenkinsfile.ppc64le
index 3f095764306..6e3784ebedf 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-kudu,!components/camel-djl,!components/camel-pulsar,!components/camel-xmpp,!components/camel-google/camel-google-pubsub,!components/camel-hdfs,!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-djl,!components/camel-pulsar,!components/camel-xmpp,!components/camel-google/camel-google-pubsub,!components/camel-hdfs,!components/camel-zookeeper,!components/camel-zookeeper-master'"
                 }
             }
             post {
diff --git a/Jenkinsfile.s390x b/Jenkinsfile.s390x
index 258cffd1144..a1734eac097 100644
--- a/Jenkinsfile.s390x
+++ b/Jenkinsfile.s390x
@@ -71,7 +71,7 @@ pipeline {
             }
             steps {
                 // Skip modules camel-kudu and docs as these are not supported 
on s390x.
-                sh "./mvnw -U $MAVEN_PARAMS -Darchetype.test.skip 
-Dmaven.test.skip.exec=true clean install -pl 
'!docs,!components/camel-kudu,!components/camel-salesforce/camel-salesforce-component'"
+                sh "./mvnw -U $MAVEN_PARAMS -Darchetype.test.skip 
-Dmaven.test.skip.exec=true clean install -pl 
'!docs,!components/camel-salesforce/camel-salesforce-component'"
             }
         }
 
diff --git a/components/camel-kudu/pom.xml b/components/camel-kudu/pom.xml
index 0dede8c2e95..9cbbf34fbb4 100644
--- a/components/camel-kudu/pom.xml
+++ b/components/camel-kudu/pom.xml
@@ -48,12 +48,13 @@
                 </plugins>
             </build>
         </profile>
+
         <profile>
-            <!-- kudu-binary is not available for Windows. It is needed for 
tests, so skip that -->
-            <id>Windows</id>
+            <!-- kudu-binary is only available for Linux or macOS on x86 64 -->
+            <id>NotLinux</id>
             <activation>
                 <os>
-                    <family>Windows</family>
+                    <family>!Linux</family>
                 </os>
             </activation>
             <properties>
@@ -62,11 +63,11 @@
             </properties>
         </profile>
         <profile>
-            <!-- kudu-binary is not available for Apple. It is needed for 
tests, so skip that -->
-            <id>Apple-Arm64-SkipTests</id>
+            <!-- kudu-binary is only available for Linux or macOS on x86 64 -->
+            <id>Notx86</id>
             <activation>
                 <os>
-                    <family>mac</family>
+                    <arch>!amd64</arch>
                 </os>
             </activation>
             <properties>

Reply via email to