diff --git a/.github/workflows/baremetal-regression-suite.yml b/.github/workflows/baremetal-regression-suite.yml index b46baae07..3975bb991 100644 --- a/.github/workflows/baremetal-regression-suite.yml +++ b/.github/workflows/baremetal-regression-suite.yml @@ -176,5 +176,23 @@ jobs: key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 - - 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 + - name: Exclude Tests + env: + EXCLUDES: ${{ vars.EXCLUDED_TESTS }} + run: | + echo $EXCLUDES >> excluded-tests.txt + cat excluded-tests.txt + + - name: Build Project + run: mvn clean install -DskipTests=true + + - name: Run Commons-HPCC Tests + run: mvn -pl commons-hpcc --activate-profiles jenkins-on-demand -Dmaven.gpg.skip=true -Dmaven.javadoc.skip=true -Dmaven.test.failure.ignore=false verify + + - name: Run WSClient Tests + run: mvn -pl wsclient --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 verify + + - name: Run DFSClient Tests + run: mvn -pl dfsclient --activate-profiles jenkins-on-demand -Dmaven.gpg.skip=true -Dmaven.javadoc.skip=true -Dmaven.test.failure.ignore=false -Dhpccconn=http://eclwatch.default:8010 verify + + diff --git a/.github/workflows/k8s-regression-suite.yml b/.github/workflows/k8s-regression-suite.yml index b37ddecba..2d94fe438 100644 --- a/.github/workflows/k8s-regression-suite.yml +++ b/.github/workflows/k8s-regression-suite.yml @@ -143,5 +143,21 @@ jobs: key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 - - 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 + - name: Exclude Tests + env: + EXCLUDES: ${{ vars.EXCLUDED_TESTS }} + run: | + echo $EXCLUDES >> excluded-tests.txt + cat excluded-tests.txt + + - name: Build Project + run: mvn clean install -DskipTests=true + + - name: Run Commons-HPCC Tests + run: mvn -pl commons-hpcc --activate-profiles jenkins-on-demand -Dmaven.gpg.skip=true -Dmaven.javadoc.skip=true -Dmaven.test.failure.ignore=false verify + + - name: Run WSClient Tests + run: mvn -pl wsclient --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 verify + + - name: Run DFSClient Tests + run: mvn -pl dfsclient --activate-profiles jenkins-on-demand -Dmaven.gpg.skip=true -Dmaven.javadoc.skip=true -Dmaven.test.failure.ignore=false -Dhpccconn=https://eclwatch.default:8010 verify diff --git a/commons-hpcc/pom.xml b/commons-hpcc/pom.xml index 0cb0f4df1..61066112e 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -27,6 +27,9 @@ maven-surefire-plugin ${maven.surefire.version} + + ../excluded-tests.txt + diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index cea5897ad..a30fe7484 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -34,6 +34,7 @@ org.hpccsystems.ws.client.TestResultNotifier + ../excluded-tests.txt diff --git a/excluded-tests.txt b/excluded-tests.txt new file mode 100644 index 000000000..c60ff0d2f --- /dev/null +++ b/excluded-tests.txt @@ -0,0 +1,3 @@ +# See: https://maven.apache.org/surefire/maven-surefire-plugin/examples/inclusion-exclusion.html#multiple-formats-in-one +# Example: +# **/*RampsDevRegressionTest.java \ No newline at end of file diff --git a/pom.xml b/pom.xml index 0a6d9e4f2..8892ae0d0 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ 2.8.2 2.5.2 3.0.2 - 2.22.1 + 3.2.5 4.10.1 1.4 0.1.54 @@ -213,6 +213,7 @@ ${argLine} ${groups} + excluded-tests.txt @@ -433,6 +434,7 @@ ${argLine} ${groups} + excluded-tests.txt @@ -485,6 +487,7 @@ ${argLine} ${groups} + excluded-tests.txt @@ -560,6 +563,7 @@ ${argLine} ${groups} + excluded-tests.txt diff --git a/wsclient/pom.xml b/wsclient/pom.xml index b2e392fe6..fba968c11 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -88,6 +88,7 @@ org.hpccsystems.ws.client.TestResultNotifier + ../excluded-tests.txt diff --git a/wsclient/src/test/java/org/hpccsystems/ws/client/WSFileIOClientTest.java b/wsclient/src/test/java/org/hpccsystems/ws/client/WSFileIOClientTest.java index e9ae11815..c1f712a0b 100644 --- a/wsclient/src/test/java/org/hpccsystems/ws/client/WSFileIOClientTest.java +++ b/wsclient/src/test/java/org/hpccsystems/ws/client/WSFileIOClientTest.java @@ -45,7 +45,6 @@ public class WSFileIOClientTest extends BaseRemoteTest private final static String testfilename = System.getProperty("lztestfile", "myfilename.txt"); private final static String targetLZ = System.getProperty("lzname", "localhost"); private final static String targetLZPath = System.getProperty("lzpath", "/var/lib/HPCCSystems/mydropzone"); - private final static String HPCC_30117 = System.getProperty("HPCC30117", "fixed"); static { @@ -57,18 +56,12 @@ public class WSFileIOClientTest extends BaseRemoteTest if (System.getProperty("lzpath") == null) System.out.println("lzpath not provided - defaulting to /var/lib/HPCCSystems/mydropzone"); - - if (System.getProperty("HPCC30117") == null) - System.out.println("HPCC30117 status not provided - defaulting to fixed"); - else - System.out.println("HPCC30117 status: '" + HPCC_30117 + "'"); } @Test public void copyFile() throws Exception { Assume.assumeFalse("Test not valid on containerized HPCC environment", client.isTargetHPCCContainerized()); - assumeTrue("Ignoring test 'copyFile' because HPCC-30117 is not fixed", HPCC_30117.equalsIgnoreCase("fixed")); String lzfile=System.currentTimeMillis() + "_csvtest.csv"; String hpccfilename="temp::" + lzfile; client.createHPCCFile(lzfile, targetLZ, true); @@ -145,7 +138,6 @@ public void copyFile() throws Exception public void AcreateHPCCFile() throws Exception, ArrayOfEspExceptionWrapper { Assume.assumeFalse("Test not valid on containerized HPCC environment", client.isTargetHPCCContainerized()); - assumeTrue("Ignoring test 'copyFile' because HPCC-30117 is not fixed", HPCC_30117.equalsIgnoreCase("fixed")); System.out.println("Creating file: '" + testfilename + "' on LandingZone: '" + targetLZ + "' on HPCC: '" + super.connString +"'"); Assert.assertTrue(client.createHPCCFile(testfilename, targetLZ, true)); } @@ -153,7 +145,6 @@ public void AcreateHPCCFile() throws Exception, ArrayOfEspExceptionWrapper @Test public void BwriteHPCCFile() throws Exception, ArrayOfEspExceptionWrapper { - assumeTrue("Ignoring test 'copyFile' because HPCC-30117 is not fixed", HPCC_30117.equalsIgnoreCase("fixed")); System.out.println("Writing data to file: '" + testfilename + "' on LandingZone: '" + targetLZ + "' on HPCC: '" + super.connString +"'"); byte[] data = "HELLO MY DARLING, HELLO MY DEAR!1234567890ABCDEFGHIJKLMNOPQRSTUVXYZ".getBytes(); Assert.assertTrue(client.writeHPCCFileData(data, testfilename, targetLZ, true, 0, 20)); @@ -163,7 +154,6 @@ public void BwriteHPCCFile() throws Exception, ArrayOfEspExceptionWrapper public void CreadHPCCFile() throws Exception, ArrayOfEspExceptionWrapper { Assume.assumeFalse("Test not valid on containerized HPCC environment", client.isTargetHPCCContainerized()); - assumeTrue("Ignoring test 'copyFile' because HPCC-30117 is not fixed", HPCC_30117.equalsIgnoreCase("fixed")); System.out.println("reading data from file: '" + testfilename + "' on LandingZone: '" + targetLZ + "' on HPCC: '" + super.connString +"'"); byte[] data = "HELLO MY DARLING, HELLO MY DEAR!1234567890ABCDEFGHIJKLMNOPQRSTUVXYZ".getBytes(); 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 deleted file mode 100644 index 88c0280a6..000000000 --- a/wsclient/src/test/java/org/hpccsystems/ws/client/WsAttributesClientIntegrationTest_620.java +++ /dev/null @@ -1,48 +0,0 @@ -package org.hpccsystems.ws.client; - -import org.hpccsystems.ws.client.wrappers.ArrayOfEspExceptionWrapper; - -public class WsAttributesClientIntegrationTest_620 extends BaseWsAttributesClientIntegrationTest -{ - @Override - public String getHPCCVersion() - { - return "6.2"; - } - - @Override - public String getThorClusterName() - { - return "dev_thor"; - } - - @Override - public String getRoxieClusterName() - { - return "roxie"; - } - - @Override - public String getHthorClusterName() - { - return "hthor"; - } - - @Override - public void testWriteAttributes() throws Exception, ArrayOfEspExceptionWrapper - { - super.testWriteAttributes(); - } - - @Override - public void testWriteSingleAttribute() throws Exception, ArrayOfEspExceptionWrapper - { - super.testWriteSingleAttribute(); - } - - @Override - public void testInvalidAttributes() throws Exception - { - super.testInvalidAttributes(); - } -} 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 deleted file mode 100644 index 477c27940..000000000 --- a/wsclient/src/test/java/org/hpccsystems/ws/client/WsWorkunitsClientIntegration_54_Test.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.hpccsystems.ws.client; - -public class WsWorkunitsClientIntegration_54_Test extends BaseWsWorkunitsClientIntegrationTest -{ - String hpccver="5.4"; - - @Override - public void confirmPlatform() throws Exception - { - if (platform.getVersion().toString().startsWith(hpccver)) - throw new Exception("Cannot run 5.4 tests against HPCC cluster on '" + platform.getIP() + "' version: '" + platform.getVersion().toString() + "'"); - } - - @Override - public String getThorClusterName() - { - return "hthor_qa"; - } - - @Override - public String getRoxieClusterName() - { - return "roxie_bair_qa_01"; - } - - @Override - public String getHthorClusterName() - { - return "hthor_qa"; - } -} 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 deleted file mode 100644 index a938a3f55..000000000 --- a/wsclient/src/test/java/org/hpccsystems/ws/client/WsWorkunitsClientIntegration_620_Test.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.hpccsystems.ws.client; - -public class WsWorkunitsClientIntegration_620_Test extends BaseWsWorkunitsClientIntegrationTest -{ - String hpccver="6.2"; - @Override - protected void confirmPlatform() throws Exception - { - if (platform.getVersion().toString().startsWith(hpccver)) - throw new Exception("Cannot run 6.2 tests against HPCC cluster on '" + platform.getIP() + "' version: '" + platform.getVersion().toString() + "'"); - } - - @Override - public String getThorClusterName() - { - return "thor"; - } - - @Override - public String getRoxieClusterName() - { - return "roxie"; - } - - @Override - public String getHthorClusterName() - { - return "hthor"; - } -} 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 index 312b15ce0..828b544b1 100644 --- 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 {