@@ -919,18 +919,14 @@ pipeline{
919919 stage(' rh7-singlenode-9.0-11' ) {
920920 when { expression {return params. regressions} }
921921 agent { label ' dhfLinuxAgent' }
922- environment{
923- JAVA_HOME = " $JAVA_HOME_DIR "
924- PATH = " $JAVA_HOME :$PATH "
925- }
926922 steps{timeout(time : 3 , unit : ' HOURS' ){
927923 catchError(buildResult : ' SUCCESS' , catchInterruptions : true , stageResult : ' FAILURE' ) {
928924 script{
929- cleanWs()
925+ cleanWs deleteDirs : true , patterns : [[ pattern : ' data-hub/** ' , type : ' EXCLUDE ' ]]
930926 props = readProperties file :' data-hub/pipeline.properties' ;
931927 copyRPM ' Release' ,' 9.0-11'
932928 setUpML ' $WORKSPACE/xdmp/src/Mark*.rpm'
933- sh 'cd $WORKSPACE/data-hub;./gradlew -g ./cache-build clean;set +e;./gradlew -g ./cache-build marklogic-data-hub:bootstrapAndTest -Dorg.gradle.jvmargs=-Xmx1g -i --stacktrace -PnodeDistributionBaseUrl=http://node-mirror.eng.marklogic.com:8080/;sleep 10s;./gradlew -g ./cache-build ml-data-hub:test -i --stacktrace -PnodeDistributionBaseUrl=http://node-mirror.eng.marklogic.com:8080/;sleep 10s;./gradlew -g ./cache-build web:test -i --stacktrace -PnodeDistributionBaseUrl=http://node-mirror.eng.marklogic.com:8080/;sleep 10s;./gradlew -g ./cache-build marklogic-data-hub-central:test -i --stacktrace -PnodeDistributionBaseUrl=http://node-mirror.eng.marklogic.com:8080/ |& tee console.log;sleep 10s;./gradlew -g ./cache-build marklogic-data-hub-spark-connector:test -i --stacktrace -PnodeDistributionBaseUrl=http://node-mirror.eng.marklogic.com:8080/;sleep 10s;./gradlew -g ./cache-build marklogic-data-hub-spark-connector:test -i --stacktrace -PnodeDistributionBaseUrl=http://node-mirror.eng.marklogic.com:8080/;'
929+ sh 'export JAVA_HOME="JAVA_HOME_DIR";export M2_HOME="$MAVEN_HOME";export PATH="$JAVA_HOME/bin:$MAVEN_HOME/bin:$PATH";cd $WORKSPACE/data-hub;./gradlew -g ./cache-build clean;set +e;./gradlew -g ./cache-build marklogic-data-hub:bootstrapAndTest -Dorg.gradle.jvmargs=-Xmx1g -i --stacktrace -PnodeDistributionBaseUrl=http://node-mirror.eng.marklogic.com:8080/;sleep 10s;./gradlew -g ./cache-build ml-data-hub:test -i --stacktrace -PnodeDistributionBaseUrl=http://node-mirror.eng.marklogic.com:8080/;sleep 10s;./gradlew -g ./cache-build web:test -i --stacktrace -PnodeDistributionBaseUrl=http://node-mirror.eng.marklogic.com:8080/;sleep 10s;./gradlew -g ./cache-build marklogic-data-hub-central:test -i --stacktrace -PnodeDistributionBaseUrl=http://node-mirror.eng.marklogic.com:8080/ |& tee console.log;sleep 10s;./gradlew -g ./cache-build marklogic-data-hub-spark-connector:test -i --stacktrace -PnodeDistributionBaseUrl=http://node-mirror.eng.marklogic.com:8080/;sleep 10s;./gradlew -g ./cache-build marklogic-data-hub-spark-connector:test -i --stacktrace -PnodeDistributionBaseUrl=http://node-mirror.eng.marklogic.com:8080/;'
934930 junit ' **/TEST-*.xml'
935931 def output= readFile ' data-hub/console.log'
936932 def result= false ;
@@ -957,17 +953,13 @@ pipeline{
957953 }
958954 stage(' fullCycle-rh7-singlenode-9.0-11' ) {
959955 agent { label ' dhfLinuxAgent' }
960- environment{
961- JAVA_HOME = " $JAVA_HOME_DIR "
962- PATH = " $JAVA_HOME :$PATH "
963- }
964956 steps {timeout(time : 3 , unit : ' HOURS' ) {
965957 catchError(buildResult : ' SUCCESS' , catchInterruptions : true , stageResult : ' FAILURE' ) {
966- cleanWs()
967- copyRPM ' Release' , ' 9.0-11'
968- setUpML ' $WORKSPACE/xdmp/src/Mark*.rpm'
969- sh ' cd $WORKSPACE/data-hub;./gradlew -g ./cache-build clean ml-data-hub:testFullCycle -i --stacktrace'
970- junit ' **/TEST-*.xml'
958+ cleanWs deleteDirs : true , patterns : [[ pattern : ' data-hub/** ' , type : ' EXCLUDE ' ]]
959+ copyRPM ' Release' , ' 9.0-11'
960+ setUpML ' $WORKSPACE/xdmp/src/Mark*.rpm'
961+ sh ' export JAVA_HOME="JAVA_HOME_DIR";export M2_HOME="$MAVEN_HOME";export PATH="$JAVA_HOME/bin:$MAVEN_HOME/bin:$PATH"; cd $WORKSPACE/data-hub;./gradlew -g ./cache-build clean ml-data-hub:testFullCycle -i --stacktrace'
962+ junit ' **/TEST-*.xml'
971963 }
972964 }}
973965 post {
@@ -1325,7 +1317,6 @@ pipeline{
13251317 JAVA_HOME = " C:\\ Program Files\\ Java\\ jdk-9.0.4"
13261318 M2_LOCAL_REPO = " $WORKSPACE /repository"
13271319 NODE_JS = " C:\\ Program Files\\ nodejs"
1328- PATH = " $JAVA_HOME ;$NODE_JS ;$PATH "
13291320 }
13301321 steps{
13311322 timeout(time : 3 , unit : ' HOURS' ){
0 commit comments