From 0b2eeb1589409a2f3813ac8a80a3ea24d57cdc0f Mon Sep 17 00:00:00 2001
From: Raza Jafri <razajafri@users.noreply.github.com>
Date: Wed, 8 Jun 2022 13:41:28 -0700
Subject: [PATCH] Remove ORC encryption test from 321cdh (#5791)

* remove ORC encryption test from 321cdh

Signed-off-by: Raza Jafri <rjafri@nvidia.com>

* addressed review comments

Signed-off-by: Raza Jafri <rjafri@nvidia.com>

Co-authored-by: Raza Jafri <rjafri@nvidia.com>
---
 tests/pom.xml                                 | 25 +++----------------
 .../spark/rapids/OrcEncryptionSuite.scala     |  0
 2 files changed, 3 insertions(+), 22 deletions(-)
 rename tests/src/test/{320+ => 320+-noncdh-nondb}/scala/com/nvidia/spark/rapids/OrcEncryptionSuite.scala (100%)

diff --git a/tests/pom.xml b/tests/pom.xml
index e19039dc61e..54b5d8721ed 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -148,25 +148,6 @@
                     </exclusions>
                 </dependency>
             </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-321cdh-test-src</id>
-                                <goals><goal>add-test-source</goal></goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.basedir}/src/test/320+/scala</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
         </profile>
         <profile>
             <!--
@@ -311,7 +292,7 @@
                                 <goals><goal>add-test-source</goal></goals>
                                 <configuration>
                                     <sources>
-                                        <source>${project.basedir}/src/test/320+/scala</source>
+                                        <source>${project.basedir}/src/test/320+-noncdh-nondb/scala</source>
                                     </sources>
                                 </configuration>
                             </execution>
@@ -339,7 +320,7 @@
                                 <goals><goal>add-test-source</goal></goals>
                                 <configuration>
                                     <sources>
-                                        <source>${project.basedir}/src/test/320+/scala</source>
+                                        <source>${project.basedir}/src/test/320+-noncdh-nondb/scala</source>
                                     </sources>
                                 </configuration>
                             </execution>
@@ -368,7 +349,7 @@
                                 <configuration>
                                     <sources>
                                         <source>${project.basedir}/src/test/330/scala</source>
-                                        <source>${project.basedir}/src/test/320+/scala</source>
+                                        <source>${project.basedir}/src/test/320+-noncdh-nondb/scala</source>
                                     </sources>
                                 </configuration>
                             </execution>
diff --git a/tests/src/test/320+/scala/com/nvidia/spark/rapids/OrcEncryptionSuite.scala b/tests/src/test/320+-noncdh-nondb/scala/com/nvidia/spark/rapids/OrcEncryptionSuite.scala
similarity index 100%
rename from tests/src/test/320+/scala/com/nvidia/spark/rapids/OrcEncryptionSuite.scala
rename to tests/src/test/320+-noncdh-nondb/scala/com/nvidia/spark/rapids/OrcEncryptionSuite.scala