Skip to content

Commit f1d83d3

Browse files
committed
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]
1 parent f088b3d commit f1d83d3

File tree

11 files changed

+26
-112
lines changed

11 files changed

+26
-112
lines changed

.github/workflows/baremetal-regression-suite.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,5 +176,11 @@ jobs:
176176
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
177177
restore-keys: ${{ runner.os }}-m2
178178

179+
- name: Exclude Tests
180+
env:
181+
EXCLUDES: ${{ vars.EXCLUDED_TESTS }}
182+
run: |
183+
echo $EXCLUDES > excluded-tests.txt
184+
179185
- name: Build with Maven
180-
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
186+
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

.github/workflows/k8s-regression-suite.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,5 +143,11 @@ jobs:
143143
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
144144
restore-keys: ${{ runner.os }}-m2
145145

146+
- name: Exclude Tests
147+
env:
148+
EXCLUDES: ${{ vars.EXCLUDED_TESTS }}
149+
run: |
150+
echo $EXCLUDES > excluded-tests.txt
151+
146152
- name: Build with Maven
147-
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
153+
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

commons-hpcc/pom.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@
2727
<plugin>
2828
<artifactId>maven-surefire-plugin</artifactId>
2929
<version>${maven.surefire.version}</version>
30+
<configuration>
31+
<excludesFile>../excluded-tests.txt</excludesFile>
32+
</configuration>
3033
</plugin>
3134
</plugins>
3235
</build>

dfsclient/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
<value>org.hpccsystems.ws.client.TestResultNotifier</value>
3535
</property>
3636
</properties>
37+
<excludesFile>../excluded-tests.txt</excludesFile>
3738
</configuration>
3839
</plugin>
3940
<plugin>

excluded-tests.txt

Whitespace-only changes.

pom.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<maven.deploy.version>2.8.2</maven.deploy.version>
4646
<maven.install.version>2.5.2</maven.install.version>
4747
<maven.jar.version>3.0.2</maven.jar.version>
48-
<maven.surefire.version>2.22.1</maven.surefire.version>
48+
<maven.surefire.version>3.2.5</maven.surefire.version>
4949
<antlr.version>4.10.1</antlr.version>
5050
<javax.mail.version>1.4</javax.mail.version>
5151
<jsch.version>0.1.54</jsch.version>
@@ -213,6 +213,7 @@
213213
<configuration>
214214
<argLine>${argLine}</argLine>
215215
<groups>${groups}</groups>
216+
<excludesFile>excluded-tests.txt</excludesFile>
216217
</configuration>
217218
</plugin>
218219
<plugin>
@@ -433,6 +434,7 @@
433434
<configuration>
434435
<argLine>${argLine}</argLine>
435436
<groups>${groups}</groups>
437+
<excludesFile>excluded-tests.txt</excludesFile>
436438
</configuration>
437439
</plugin>
438440
</plugins>
@@ -485,6 +487,7 @@
485487
<configuration>
486488
<argLine>${argLine}</argLine>
487489
<groups>${groups}</groups>
490+
<excludesFile>excluded-tests.txt</excludesFile>
488491
</configuration>
489492
</plugin>
490493
</plugins>
@@ -560,6 +563,7 @@
560563
<configuration>
561564
<argLine>${argLine}</argLine>
562565
<groups>${groups}</groups>
566+
<excludesFile>excluded-tests.txt</excludesFile>
563567
</configuration>
564568
</plugin>
565569
</plugins>

wsclient/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@
8888
<value>org.hpccsystems.ws.client.TestResultNotifier</value>
8989
</property>
9090
</properties>
91+
<excludesFile>../excluded-tests.txt</excludesFile>
9192
</configuration>
9293
</plugin>
9394
</plugins>

wsclient/src/test/java/org/hpccsystems/ws/client/WsAttributesClientIntegrationTest_620.java

Lines changed: 0 additions & 48 deletions
This file was deleted.

wsclient/src/test/java/org/hpccsystems/ws/client/WsWorkunitsClientIntegration_54_Test.java

Lines changed: 0 additions & 31 deletions
This file was deleted.

wsclient/src/test/java/org/hpccsystems/ws/client/WsWorkunitsClientIntegration_620_Test.java

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)