This is an automated email from the ASF dual-hosted git repository.
joewitt 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 013d01a9fc NIFI-10558 This closes #6456. Updated Ranger modules to
skip tests on AArch64
013d01a9fc is described below
commit 013d01a9fc378cfcbcfcedf4e4678b575af5100c
Author: exceptionfactory <[email protected]>
AuthorDate: Fri May 13 16:19:59 2022 -0500
NIFI-10558 This closes #6456. Updated Ranger modules to skip tests on
AArch64
Signed-off-by: Joe Witt <[email protected]>
---
.../nifi-ranger-bundle/nifi-ranger-plugin/pom.xml | 12 ++++++++
nifi-nar-bundles/pom.xml | 34 +--------------------
.../nifi-registry-ranger-plugin/pom.xml | 12 ++++++++
nifi-registry/nifi-registry-extensions/pom.xml | 35 +---------------------
4 files changed, 26 insertions(+), 67 deletions(-)
diff --git a/nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-plugin/pom.xml
b/nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-plugin/pom.xml
index f58eaa5318..d4293ba388 100644
--- a/nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-plugin/pom.xml
+++ b/nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-plugin/pom.xml
@@ -212,6 +212,18 @@
</dependencies>
<profiles>
+ <!-- Disable tests on AArch64 which does not have necessary
platform-specific libraries -->
+ <profile>
+ <id>disable-ranger-tests</id>
+ <activation>
+ <os>
+ <arch>aarch64</arch>
+ </os>
+ </activation>
+ <properties>
+ <skipTests>true</skipTests>
+ </properties>
+ </profile>
<!-- Includes hadoop-aws for accessing HDFS with an s3a:// filesystem
-->
<profile>
<id>include-hadoop-aws</id>
diff --git a/nifi-nar-bundles/pom.xml b/nifi-nar-bundles/pom.xml
index 2760930c20..5828cbce7b 100755
--- a/nifi-nar-bundles/pom.xml
+++ b/nifi-nar-bundles/pom.xml
@@ -90,6 +90,7 @@
<module>nifi-cybersecurity-bundle</module>
<module>nifi-parquet-bundle</module>
<module>nifi-extension-utils</module>
+ <module>nifi-ranger-bundle</module>
<module>nifi-redis-bundle</module>
<module>nifi-metrics-reporting-bundle</module>
<module>nifi-spark-bundle</module>
@@ -174,39 +175,6 @@
<module>nifi-grpc-bundle</module>
</modules>
</profile>
- <profile>
- <id>include-ranger</id>
- <!-- This profile handles the inclusion of ranger artifacts.
Currently, ranger
- uses JNA libraries that require x86 components, so it is platform
dependent. -->
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <modules>
- <module>nifi-ranger-bundle</module>
- </modules>
- </profile>
- <profile>
- <id>include-ranger-x86</id>
- <activation>
- <os>
- <arch>x86_64</arch>
- </os>
- </activation>
- <modules>
- <module>nifi-ranger-bundle</module>
- </modules>
- </profile>
- <profile>
- <id>include-ranger-amd64</id>
- <activation>
- <os>
- <arch>amd64</arch>
- </os>
- </activation>
- <modules>
- <module>nifi-ranger-bundle</module>
- </modules>
- </profile>
</profiles>
<dependencyManagement>
diff --git
a/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-plugin/pom.xml
b/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-plugin/pom.xml
index 301eec5554..1934c5e46e 100644
---
a/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-plugin/pom.xml
+++
b/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-plugin/pom.xml
@@ -291,6 +291,18 @@
</dependencies>
<profiles>
+ <!-- Disable tests on AArch64 which does not have necessary
platform-specific libraries -->
+ <profile>
+ <id>disable-ranger-tests</id>
+ <activation>
+ <os>
+ <arch>aarch64</arch>
+ </os>
+ </activation>
+ <properties>
+ <skipTests>true</skipTests>
+ </properties>
+ </profile>
<!-- Includes hadoop-aws for accessing HDFS with an s3a:// filesystem
-->
<profile>
<id>include-hadoop-aws</id>
diff --git a/nifi-registry/nifi-registry-extensions/pom.xml
b/nifi-registry/nifi-registry-extensions/pom.xml
index 17c9000707..7f7fece474 100644
--- a/nifi-registry/nifi-registry-extensions/pom.xml
+++ b/nifi-registry/nifi-registry-extensions/pom.xml
@@ -26,39 +26,6 @@
<modules>
<module>nifi-registry-aws</module>
+ <module>nifi-registry-ranger</module>
</modules>
-
- <profiles>
- <profile>
- <id>include-ranger</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <modules>
- <module>nifi-registry-ranger</module>
- </modules>
- </profile>
- <profile>
- <id>include-ranger-x86</id>
- <activation>
- <os>
- <arch>x86_64</arch>
- </os>
- </activation>
- <modules>
- <module>nifi-registry-ranger</module>
- </modules>
- </profile>
- <profile>
- <id>include-ranger-amd64</id>
- <activation>
- <os>
- <arch>amd64</arch>
- </os>
- </activation>
- <modules>
- <module>nifi-registry-ranger</module>
- </modules>
- </profile>
- </profiles>
</project>
