Restored surefire failsafe distinction

snowflakedb · Nov 21, 2024 · 200f5e7 · 200f5e7
1 parent 120bb33
commit 200f5e7
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 13 deletions.
diff --git a/ci/container/test_component.sh b/ci/container/test_component.sh
@@ -83,7 +83,7 @@ if [[ "$is_old_driver" == "true" ]]; then
         $MVNW_EXE -DjenkinsIT \
             -Djava.io.tmpdir=$WORKSPACE \
             -Djacoco.skip.instrument=false \
-            -Dtest="$JDBC_TEST_CATEGORY" \
+            -DintegrationTestSuites="$JDBC_TEST_CATEGORY" \
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
             verify \
             --batch-mode --show-version
@@ -94,7 +94,7 @@ elif [[ "$JDBC_TEST_CATEGORY" == "FipsTestSuite" ]]; then
         $MVNW_EXE -DjenkinsIT \
             -Djava.io.tmpdir=$WORKSPACE \
             -Djacoco.skip.instrument=false \
-            -Dtest=UnitTestSuite,FipsTestSuite \
+            -DintegrationTestSuites=FipsTestSuite \
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
             -Dnot-self-contained-jar \
             verify \
@@ -105,7 +105,7 @@ else
     $MVNW_EXE -DjenkinsIT \
         -Djava.io.tmpdir=$WORKSPACE \
         -Djacoco.skip.instrument=false \
-        -Dtest=UnitTestSuite,"$JDBC_TEST_CATEGORY" \
+        -DintegrationTestSuites="$JDBC_TEST_CATEGORY" \
         -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
         -Dnot-self-contained-jar $ADDITIONAL_MAVEN_PROFILE \
         verify \

diff --git a/ci/test_windows.bat b/ci/test_windows.bat
@@ -117,6 +117,7 @@ if "%JDBC_TEST_CATEGORY%"=="FipsTestSuite" (
     cmd /c %MVNW_EXE% -B -DjenkinsIT ^
         -Djava.io.tmpdir=%GITHUB_WORKSPACE% ^
         -Djacoco.skip.instrument=false ^
+        -DintegrationTestSuites=FipsTestSuite ^
         -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn ^
         -Dnot-self-contained-jar ^
         verify ^
@@ -136,7 +137,7 @@ if "%JDBC_TEST_CATEGORY%"=="FipsTestSuite" (
     cmd /c %MVNW_EXE% -B -DjenkinsIT ^
         -Djava.io.tmpdir=%GITHUB_WORKSPACE% ^
         -Djacoco.skip.instrument=false ^
-        -Dtest=UnitTestSuite,"%JDBC_TEST_CATEGORY%" ^
+        -DintegrationTestSuites="%JDBC_TEST_CATEGORY%" ^
         -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn ^
         -Dnot-self-contained-jar %ADDITIONAL_MAVEN_PROFILE% ^
         verify ^

diff --git a/parent-pom.xml b/parent-pom.xml
@@ -79,6 +79,7 @@
     <shadeBase>net.snowflake.client.jdbc.internal</shadeBase>
     <slf4j.version>2.0.13</slf4j.version>
     <snowflake.common.version>5.1.4</snowflake.common.version>
+    <integrationTestSuites>UnitTestSuite</integrationTestSuites>
     <tika.version>2.4.1</tika.version>
     <tukaani.version>1.9</tukaani.version>
     <version.maven>3.6.3</version.maven>

diff --git a/pom.xml b/pom.xml
@@ -1180,10 +1180,7 @@
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
-              <systemPropertyVariables>
-                <net.snowflake.jdbc.loggerImpl>net.snowflake.client.log.JDK14Logger</net.snowflake.jdbc.loggerImpl>
-                <java.util.logging.config.file>${basedir}/src/test/resources/logging.properties</java.util.logging.config.file>
-              </systemPropertyVariables>
+              <test>UnitTestSuite</test>
             </configuration>
             <dependencies>
               <dependency>
@@ -1198,23 +1195,33 @@
                   <goal>test</goal>
                 </goals>
               </execution>
-              <!--
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-failsafe-plugin</artifactId>
+            <configuration>
+              <argLine>--add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED</argLine>
+            </configuration>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>verify</goal>
+                </goals>
+              </execution>
               <execution>
                 <id>DefaultIT</id>
                 <goals>
                   <goal>integration-test</goal>
                 </goals>
                 <configuration>
-                  <excludes>
-                    <exclude>**/DellBoomiCloudIT.java</exclude>
-                  </excludes>
                   <systemPropertyVariables>
                     <net.snowflake.jdbc.loggerImpl>net.snowflake.client.log.JDK14Logger</net.snowflake.jdbc.loggerImpl>
                     <java.util.logging.config.file>${basedir}/src/test/resources/logging.properties</java.util.logging.config.file>
                   </systemPropertyVariables>
+                  <test>${integrationTestSuites}</test>
                 </configuration>
               </execution>
-              -->
             </executions>
           </plugin>
           <plugin>