HPCC4J-594 Add support for skipping tests

- Updated version of surefire plugin to support excludes file - Added logic to generate an excludes file to GH actions Signed-off-by: James McMullan [email protected]
hpcc-systems · May 21, 2024 · f1d83d3 · f1d83d3
1 parent f088b3d
commit f1d83d3
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 112 deletions.
diff --git a/.github/workflows/baremetal-regression-suite.yml b/.github/workflows/baremetal-regression-suite.yml
@@ -176,5 +176,11 @@ jobs:
         key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
         restore-keys: ${{ runner.os }}-m2
 
+    - name: Exclude Tests
+      env:
+        EXCLUDES: ${{ vars.EXCLUDED_TESTS }}
+      run: |
+        echo $EXCLUDES > excluded-tests.txt
+
     - name: Build with Maven
-      run: mvn -B --activate-profiles jenkins-on-demand -Dmaven.gpg.skip=true -Dmaven.javadoc.skip=true -Dmaven.test.failure.ignore=false -Dhpccconn=http://eclwatch.default:8010 -Dwssqlconn=http://sql2ecl.default:8510 -DHPCC30117=open install
+      run: mvn -B --activate-profiles jenkins-on-demand -Dmaven.gpg.skip=true -Dmaven.javadoc.skip=true -Dmaven.test.failure.ignore=false -Dhpccconn=http://eclwatch.default:8010 -Dwssqlconn=http://sql2ecl.default:8510 install
diff --git a/.github/workflows/k8s-regression-suite.yml b/.github/workflows/k8s-regression-suite.yml
@@ -143,5 +143,11 @@ jobs:
         key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
         restore-keys: ${{ runner.os }}-m2
 
+    - name: Exclude Tests
+      env:
+        EXCLUDES: ${{ vars.EXCLUDED_TESTS }}
+      run: |
+        echo $EXCLUDES > excluded-tests.txt
+
     - name: Build with Maven
-      run: mvn -B --activate-profiles jenkins-on-demand -Dmaven.gpg.skip=true -Dmaven.javadoc.skip=true -Dmaven.test.failure.ignore=false -Dhpccconn=https://eclwatch.default:8010 -Dwssqlconn=https://sql2ecl.default:8510 -DHPCC30117=open  install
+      run: mvn -B --activate-profiles jenkins-on-demand -Dmaven.gpg.skip=true -Dmaven.javadoc.skip=true -Dmaven.test.failure.ignore=false -Dhpccconn=https://eclwatch.default:8010 -Dwssqlconn=https://sql2ecl.default:8510 install
diff --git a/commons-hpcc/pom.xml b/commons-hpcc/pom.xml
@@ -27,6 +27,9 @@
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <version>${maven.surefire.version}</version>
+        <configuration>
+          <excludesFile>../excluded-tests.txt</excludesFile>
+        </configuration>
       </plugin>
     </plugins>
   </build>

diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml
@@ -34,6 +34,7 @@
                 <value>org.hpccsystems.ws.client.TestResultNotifier</value>
               </property>
             </properties>
+            <excludesFile>../excluded-tests.txt</excludesFile>
           </configuration>
       </plugin>
       <plugin>

diff --git a/excluded-tests.txt b/excluded-tests.txt
diff --git a/pom.xml b/pom.xml
@@ -45,7 +45,7 @@
     <maven.deploy.version>2.8.2</maven.deploy.version>
     <maven.install.version>2.5.2</maven.install.version>
     <maven.jar.version>3.0.2</maven.jar.version>
-    <maven.surefire.version>2.22.1</maven.surefire.version>
+    <maven.surefire.version>3.2.5</maven.surefire.version>
     <antlr.version>4.10.1</antlr.version>
     <javax.mail.version>1.4</javax.mail.version>
     <jsch.version>0.1.54</jsch.version>
@@ -213,6 +213,7 @@
           <configuration>
             <argLine>${argLine}</argLine>
             <groups>${groups}</groups>
+            <excludesFile>excluded-tests.txt</excludesFile>
           </configuration>
         </plugin>
         <plugin>
@@ -433,6 +434,7 @@
             <configuration>
               <argLine>${argLine}</argLine>
               <groups>${groups}</groups>
+              <excludesFile>excluded-tests.txt</excludesFile>
             </configuration>
           </plugin>
         </plugins>
@@ -485,6 +487,7 @@
             <configuration>
               <argLine>${argLine}</argLine>
               <groups>${groups}</groups>
+              <excludesFile>excluded-tests.txt</excludesFile>
             </configuration>
           </plugin>
         </plugins>
@@ -560,6 +563,7 @@
             <configuration>
               <argLine>${argLine}</argLine>
               <groups>${groups}</groups>
+              <excludesFile>excluded-tests.txt</excludesFile>
             </configuration>
           </plugin>
         </plugins>

diff --git a/wsclient/pom.xml b/wsclient/pom.xml
@@ -88,6 +88,7 @@
                 <value>org.hpccsystems.ws.client.TestResultNotifier</value>
               </property>
             </properties>
+            <excludesFile>../excluded-tests.txt</excludesFile>
           </configuration>
       </plugin>
    </plugins>

diff --git a/wsclient/src/test/java/org/hpccsystems/ws/client/WsAttributesClientIntegrationTest_620.java b/wsclient/src/test/java/org/hpccsystems/ws/client/WsAttributesClientIntegrationTest_620.java
diff --git a/wsclient/src/test/java/org/hpccsystems/ws/client/WsWorkunitsClientIntegration_54_Test.java b/wsclient/src/test/java/org/hpccsystems/ws/client/WsWorkunitsClientIntegration_54_Test.java
diff --git a/wsclient/src/test/java/org/hpccsystems/ws/client/WsWorkunitsClientIntegration_620_Test.java b/wsclient/src/test/java/org/hpccsystems/ws/client/WsWorkunitsClientIntegration_620_Test.java
diff --git a/wsclient/src/test/java/org/hpccsystems/ws/client/platform/RampsDevRegressionTest.java b/wsclient/src/test/java/org/hpccsystems/ws/client/platform/RampsDevRegressionTest.java
@@ -6,9 +6,11 @@
 
 import org.hpccsystems.ws.client.wrappers.ArrayOfEspExceptionWrapper;
 import org.hpccsystems.ws.client.wrappers.wsdfu.DFUDataColumnWrapper;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
+@Ignore
 @Category(org.hpccsystems.commons.annotations.IntegrationTests.class)
 public class RampsDevRegressionTest extends EclParseRegressionTest
 {