This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 97e7a3c030 NIFI-9809 Disabled Kudu tests on ARM64
97e7a3c030 is described below
commit 97e7a3c030dba7925cb4e15708d003bda36903ad
Author: Kevin Doran <[email protected]>
AuthorDate: Fri Jul 15 14:32:08 2022 -0400
NIFI-9809 Disabled Kudu tests on ARM64
This closes #6214
Signed-off-by: David Handermann <[email protected]>
---
.../nifi-kudu-controller-service/pom.xml | 24 ++++++++-----
.../nifi-kudu-bundle/nifi-kudu-processors/pom.xml | 24 ++++++++-----
nifi-nar-bundles/nifi-kudu-bundle/pom.xml | 40 ++++++++++++++++++++++
3 files changed, 72 insertions(+), 16 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-controller-service/pom.xml
b/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-controller-service/pom.xml
index 8a167584e8..766f677731 100644
--- a/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-controller-service/pom.xml
+++ b/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-controller-service/pom.xml
@@ -97,22 +97,29 @@
</dependencies>
<profiles>
<profile>
- <id>kudu-windows</id>
+ <id>kudu-linux-x86</id>
<activation>
<os>
- <family>Windows</family>
+ <family>Unix</family>
+ <arch>x86_64</arch>
</os>
</activation>
- <properties>
- <!-- Kudu tests do not support Windows. -->
- <exclude.tests>**/*.java</exclude.tests>
- </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.kudu</groupId>
+ <artifactId>kudu-binary</artifactId>
+ <version>${kudu.version}</version>
+ <classifier>${os.detected.classifier}</classifier>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</profile>
<profile>
- <id>kudu-linux</id>
+ <id>kudu-linux-amd64</id>
<activation>
<os>
<family>Unix</family>
+ <arch>amd64</arch>
</os>
</activation>
<dependencies>
@@ -126,10 +133,11 @@
</dependencies>
</profile>
<profile>
- <id>kudu-mac</id>
+ <id>kudu-mac-x86</id>
<activation>
<os>
<family>mac</family>
+ <arch>x86_64</arch>
</os>
</activation>
<dependencies>
diff --git a/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-processors/pom.xml
b/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-processors/pom.xml
index 5d45b1780b..36f5c9bb35 100644
--- a/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-processors/pom.xml
@@ -116,22 +116,29 @@
</dependencies>
<profiles>
<profile>
- <id>kudu-windows</id>
+ <id>kudu-linux-x86</id>
<activation>
<os>
- <family>Windows</family>
+ <family>Unix</family>
+ <arch>x86_64</arch>
</os>
</activation>
- <properties>
- <!-- Kudu tests do not support Windows. -->
- <exclude.tests>**/*.java</exclude.tests>
- </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.kudu</groupId>
+ <artifactId>kudu-binary</artifactId>
+ <version>${kudu.version}</version>
+ <classifier>${os.detected.classifier}</classifier>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</profile>
<profile>
- <id>kudu-linux</id>
+ <id>kudu-linux-amd64</id>
<activation>
<os>
<family>Unix</family>
+ <arch>amd64</arch>
</os>
</activation>
<dependencies>
@@ -145,10 +152,11 @@
</dependencies>
</profile>
<profile>
- <id>kudu-mac</id>
+ <id>kudu-mac-x86</id>
<activation>
<os>
<family>mac</family>
+ <arch>x86_64</arch>
</os>
</activation>
<dependencies>
diff --git a/nifi-nar-bundles/nifi-kudu-bundle/pom.xml
b/nifi-nar-bundles/nifi-kudu-bundle/pom.xml
index 8f2c8f5ddf..3e35b8bb50 100644
--- a/nifi-nar-bundles/nifi-kudu-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-kudu-bundle/pom.xml
@@ -35,4 +35,44 @@
<module>nifi-kudu-nar</module>
<module>nifi-kudu-controller-service</module>
</modules>
+
+ <profiles>
+ <profile>
+ <id>kudu-windows</id>
+ <activation>
+ <os>
+ <family>Windows</family>
+ </os>
+ </activation>
+ <properties>
+ <!-- Kudu tests do not support Windows. -->
+ <exclude.tests>**/*.java</exclude.tests>
+ </properties>
+ </profile>
+ <profile>
+ <id>kudu-arm64</id>
+ <activation>
+ <os>
+ <arch>arm64</arch>
+ </os>
+ </activation>
+ <properties>
+ <!-- Kudu tests do not support arm (as of kudu 1.16, it may be
supported in the future). -->
+ <exclude.tests>**/*.java</exclude.tests>
+ </properties>
+ </profile>
+ <profile>
+ <id>kudu-aarch64</id>
+ <activation>
+ <os>
+ <arch>aarch64</arch>
+ </os>
+ </activation>
+ <properties>
+ <!-- Kudu tests do not support arm (as of kudu 1.16, it may be
supported in the future). -->
+ <exclude.tests>**/*.java</exclude.tests>
+ </properties>
+ </profile>
+ </profiles>
+
</project>
