Merge pull request #1478 from marklogic/feature/jenkins-testing

Trying to fix failures on Jenkins

Author: rjrudin

Jenkinsfile

@@ -33,7 +33,9 @@ def runtests(String type, String version){
                 export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
                 export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
                 cd java-client-api
-                ./gradlew marklogic-client-api-functionaltests:test || true
+                ./gradlew mlDeploy
+                ./gradlew marklogic-client-api-functionaltests:testFastFunctionalTests || true
+                ./gradlew marklogic-client-api-functionaltests:testSlowFunctionalTests || true
             '''
             sh label:'post-test-process', script: '''
                 cd $WORKSPACE/java-client-api/marklogic-client-api/build/test-results/test/
@@ -81,6 +83,7 @@ pipeline{
           export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
           cd java-client-api
           ./gradlew marklogic-client-api:test  || true
+          ./gradlew marklogic-client-api-functionaltests:testFastFunctionalTests || true
         '''
         sh label:'ml development tool test', script: '''#!/bin/bash
           export JAVA_HOME=$JAVA_HOME_DIR

marklogic-client-api-functionaltests/build.gradle

@@ -35,3 +35,14 @@ dependencies {
 
   testImplementation group: 'ch.qos.logback', name: 'logback-classic', version:'1.2.11'
 }
+
+task testFastFunctionalTests(type: Test) {
+  description = "Run all fast functional tests that don't setup/teardown custom app servers / databases"
+  include "com/marklogic/client/fastfunctest/**"
+}
+
+task testSlowFunctionalTests(type: Test) {
+  description = "Run slow functional tests; i.e. those that setup/teardown custom app servers / databases"
+  include "com/marklogic/client/datamovement/functionaltests/**"
+  include "com/marklogic/client/functionaltest/**"
+}