@@ -317,7 +317,7 @@ void BuildDatahub(){
317317}
318318
319319void dh5Example () {
320- sh ' cd $WORKSPACE/data-hub/examples/dh-5-example;repo=" maven {url \' http ://distro .marklogic.com/nexus /repository/maven-snapshots/\' }";sed -i "/repositories {/a$repo" build.gradle; '
320+ sh ' cd $WORKSPACE/data-hub/examples/dh-5-example;repo=" maven {url \' https ://neuxs .marklogic.com/repository/maven-snapshots/\' }";sed -i "/repositories {/a$repo" build.gradle; '
321321 copyRPM ' Release' ,' 10.0-6'
322322 script{
323323 props = readProperties file :' data-hub/pipeline.properties' ;
@@ -341,7 +341,7 @@ void dh5Example() {
341341}
342342
343343void dhCustomHook () {
344- sh ' cd $WORKSPACE/data-hub/examples/dhf5-custom-hook;repo=" maven {url \' http ://distro .marklogic.com/nexus /repository/maven-snapshots/\' }";sed -i "/repositories {/a$repo" build.gradle; '
344+ sh ' cd $WORKSPACE/data-hub/examples/dhf5-custom-hook;repo=" maven {url \' https ://nexus .marklogic.com/repository/maven-snapshots/\' }";sed -i "/repositories {/a$repo" build.gradle; '
345345 copyRPM ' Release' ,' 10.0-6'
346346 script{
347347 props = readProperties file :' data-hub/pipeline.properties' ;
@@ -364,7 +364,7 @@ void dhCustomHook() {
364364}
365365
366366void mappingExample () {
367- sh ' cd $WORKSPACE/data-hub/examples/mapping-example;repo=" maven {url \' http ://distro .marklogic.com/nexus /repository/maven-snapshots/\' }";sed -i "/repositories {/a$repo" build.gradle; '
367+ sh ' cd $WORKSPACE/data-hub/examples/mapping-example;repo=" maven {url \' https ://nexus .marklogic.com/repository/maven-snapshots/\' }";sed -i "/repositories {/a$repo" build.gradle; '
368368 copyRPM ' Release' ,' 10.0-6'
369369 script{
370370 props = readProperties file :' data-hub/pipeline.properties' ;
@@ -389,7 +389,7 @@ void mappingExample() {
389389}
390390
391391void smartMastering () {
392- sh ' cd $WORKSPACE/data-hub/examples/smart-mastering-complete;repo=" maven {url \' http ://distro .marklogic.com/nexus /repository/maven-snapshots/\' }";sed -i "/repositories {/a$repo" build.gradle; '
392+ sh ' cd $WORKSPACE/data-hub/examples/smart-mastering-complete;repo=" maven {url \' https ://nexus .marklogic.com/repository/maven-snapshots/\' }";sed -i "/repositories {/a$repo" build.gradle; '
393393 copyRPM ' Release' ,' 10.0-6'
394394 script{
395395 props = readProperties file :' data-hub/pipeline.properties' ;
@@ -676,10 +676,6 @@ void fullCycleSingleNodeTestOnLinux(String type,String mlVersion){
676676
677677void invokeDhsTestJob (){
678678 cleanWs deleteDirs : true , patterns : [[pattern : ' data-hub/**' , type : ' EXCLUDE' ]]
679-
680- sh ' export JAVA_HOME=`eval echo "$JAVA_HOME_DIR"`;export GRADLE_USER_HOME=$WORKSPACE$GRADLE_DIR;export M2_HOME=$MAVEN_HOME/bin;export PATH=$JAVA_HOME/bin:$GRADLE_USER_HOME:$PATH:$MAVEN_HOME/bin;cd $WORKSPACE/data-hub;rm -rf $GRADLE_USER_HOME/caches;./gradlew clean;cp ~/.gradle/gradle.properties $GRADLE_USER_HOME;chmod 777 $GRADLE_USER_HOME/gradle.properties;./gradlew build -x test -PnodeDistributionBaseUrl=http://node-mirror.eng.marklogic.com:8080/ --parallel;./gradlew publish -PnodeDistributionBaseUrl=http://node-mirror.eng.marklogic.com:8080/ --rerun-tasks'
681- build job : ' DatahubService/Run-Tests-dhs' , propagate : false , wait : false
682-
683679}
684680
685681void invokeDhcceTestJob (){
@@ -943,13 +939,7 @@ pipeline{
943939 }
944940
945941 stage(' publishing' ){
946- when {
947- expression {
948- props = readProperties file : ' data-hub/pipeline.properties' ;
949- println (props[' ExecutionBranch' ])
950- return (env. BRANCH_NAME == props[' ExecutionBranch' ] && ! params. regressions)
951- }
952- }
942+ when {expression {return params. regressions}}
953943 agent { label ' dhfLinuxAgent' }
954944 steps {
955945 sh ' export JAVA_HOME=`eval echo "$JAVA_HOME_DIR"`;export GRADLE_USER_HOME=$WORKSPACE$GRADLE_DIR;export M2_HOME=$MAVEN_HOME/bin;export PATH=$JAVA_HOME/bin:$GRADLE_USER_HOME:$PATH:$MAVEN_HOME/bin;cd $WORKSPACE/data-hub;rm -rf $GRADLE_USER_HOME/caches;./gradlew clean;cp ~/.gradle/gradle.properties $GRADLE_USER_HOME;chmod 777 $GRADLE_USER_HOME/gradle.properties;./gradlew build -x test -PnodeDistributionBaseUrl=http://node-mirror.eng.marklogic.com:8080/ --parallel;./gradlew publish -PnodeDistributionBaseUrl=http://node-mirror.eng.marklogic.com:8080/ --rerun-tasks'
0 commit comments