NIFI-10558 This closes apache#6456. Updated Ranger modules to skip te…

…sts on AArch64 Signed-off-by: Joe Witt <[email protected]>
nexr · Sep 28, 2022 · 013d01a · 013d01a
1 parent 1a99b96
commit 013d01a
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 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
@@ -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
@@ -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/...egistry/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-plugin/pom.xml b/...egistry/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
@@ -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>