Skip to content

Commit 41ebcac

Browse files
updating master and ml versions
1 parent cd02e4b commit 41ebcac

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

Jenkinsfile

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ pipeline{
6868
steps{
6969
script{
7070
props = readProperties file:'data-hub/pipeline.properties';
71-
copyRPM 'Release','10.0-2'
71+
copyRPM 'Release','10.0-2.1'
7272
setUpML '$WORKSPACE/xdmp/src/Mark*.rpm'
7373
sh 'export JAVA_HOME=`eval echo "$JAVA_HOME_DIR"`;export GRADLE_USER_HOME=$WORKSPACE$GRADLE_DIR;export M2_HOME=$MAVEN_HOME/bin;export PATH=$GRADLE_USER_HOME:$PATH:$MAVEN_HOME/bin;cd $WORKSPACE/data-hub;rm -rf $GRADLE_USER_HOME/caches;set +e;./gradlew clean;./gradlew marklogic-data-hub:test || true;sleep 10s;./gradlew ml-data-hub:test || true;./gradlew web:test || true;'
7474
junit '**/TEST-*.xml'
@@ -119,7 +119,7 @@ pipeline{
119119
}
120120
beforeAgent true
121121
}
122-
agent {label 'master'};
122+
agent {label 'dhmaster'};
123123
steps{
124124
script{
125125
if(env.CHANGE_TITLE.split(':')[1].contains("Automated PR")){
@@ -158,7 +158,7 @@ pipeline{
158158
changeRequest author: '', authorDisplayName: '', authorEmail: '', branch: '', fork: '', id: '', target: '5.x-develop', title: '', url: ''
159159
beforeAgent true
160160
}
161-
agent {label 'master'};
161+
agent {label 'dhmaster'};
162162
steps{
163163
retry(5){
164164
withCredentials([usernameColonPassword(credentialsId: '550650ab-ee92-4d31-a3f4-91a11d5388a3', variable: 'Credentials')]) {
@@ -242,7 +242,7 @@ pipeline{
242242
steps{
243243
script{
244244
props = readProperties file:'data-hub/pipeline.properties';
245-
copyRPM 'Release','9.0-10'
245+
copyRPM 'Release','9.0-10.4'
246246
setUpML '$WORKSPACE/xdmp/src/Mark*.rpm'
247247
sh 'export JAVA_HOME=`eval echo "$JAVA_HOME_DIR"`;export GRADLE_USER_HOME=$WORKSPACE$GRADLE_DIR;export M2_HOME=$MAVEN_HOME/bin;export PATH=$GRADLE_USER_HOME:$PATH:$MAVEN_HOME/bin;cd $WORKSPACE/data-hub;rm -rf $GRADLE_USER_HOME/caches;./gradlew clean;set +e;./gradlew marklogic-data-hub:test -Dorg.gradle.jvmargs=-Xmx1g;sleep 10s;./gradlew ml-data-hub:test;sleep 10s;./gradlew web:test;sleep 10s;./gradlew marklogic-data-hub:testBootstrap;sleep 10s;./gradlew ml-data-hub:testFullCycle;'
248248
junit '**/TEST-*.xml'
@@ -278,7 +278,7 @@ pipeline{
278278
branch 'FeatureBranch'
279279
beforeAgent true
280280
}
281-
agent {label 'master'}
281+
agent {label 'dhmaster'}
282282
steps{
283283
withCredentials([usernameColonPassword(credentialsId: '550650ab-ee92-4d31-a3f4-91a11d5388a3', variable: 'Credentials')]) {
284284
script{
@@ -401,7 +401,7 @@ pipeline{
401401
steps{
402402
script{
403403
props = readProperties file:'data-hub/pipeline.properties';
404-
copyRPM 'Release','9.0-9'
404+
copyRPM 'Release','9.0-9.5'
405405
def dockerhost=setupMLDockerCluster 3
406406
sh 'docker exec -u builder -i '+dockerhost+' /bin/sh -c "su -builder;export JAVA_HOME=`eval echo "$JAVA_HOME_DIR"`;export GRADLE_USER_HOME=$WORKSPACE$GRADLE_DIR;export M2_HOME=$MAVEN_HOME/bin;export PATH=$GRADLE_USER_HOME:$PATH:$MAVEN_HOME/bin;cd $WORKSPACE/data-hub;rm -rf $GRADLE_USER_HOME/caches;./gradlew clean;set +e;./gradlew marklogic-data-hub:test;sleep 10s;./gradlew ml-data-hub:test;sleep 10s;./gradlew web:test;sleep 10s;./gradlew marklogic-data-hub:testBootstrap;sleep 10s;./gradlew ml-data-hub:testFullCycle;"'
407407
}
@@ -435,7 +435,7 @@ pipeline{
435435
stage('rh7_cluster_9.0-10'){
436436
agent { label 'dhfLinuxAgent'}
437437
steps{
438-
copyRPM 'Release','9.0-10'
438+
copyRPM 'Release','9.0-10.4'
439439
script{
440440
def dockerhost=setupMLDockerCluster 3
441441
sh 'docker exec -u builder -i '+dockerhost+' /bin/sh -c "su -builder;export JAVA_HOME=`eval echo "$JAVA_HOME_DIR"`;export GRADLE_USER_HOME=$WORKSPACE$GRADLE_DIR;export M2_HOME=$MAVEN_HOME/bin;export PATH=$GRADLE_USER_HOME:$PATH:$MAVEN_HOME/bin;cd $WORKSPACE/data-hub;rm -rf $GRADLE_USER_HOME/caches;./gradlew clean;set +e;./gradlew marklogic-data-hub:test;sleep 10s;./gradlew ml-data-hub:test;sleep 10s;./gradlew web:test;sleep 10s;./gradlew marklogic-data-hub:testBootstrap;sleep 10s;./gradlew ml-data-hub:testFullCycle;"'
@@ -469,7 +469,7 @@ pipeline{
469469
stage('rh7_cluster_10.0-2'){
470470
agent { label 'dhfLinuxAgent'}
471471
steps{
472-
copyRPM 'Release','10.0-2'
472+
copyRPM 'Release','10.0-2.1'
473473
script{
474474
def dockerhost=setupMLDockerCluster 3
475475
sh 'docker exec -u builder -i '+dockerhost+' /bin/sh -c "export JAVA_HOME=`eval echo "$JAVA_HOME_DIR"`;export GRADLE_USER_HOME=$WORKSPACE$GRADLE_DIR;export M2_HOME=$MAVEN_HOME/bin;export PATH=$GRADLE_USER_HOME:$PATH:$MAVEN_HOME/bin;cd $WORKSPACE/data-hub;rm -rf $GRADLE_USER_HOME/caches;./gradlew clean;set +e;./gradlew marklogic-data-hub:test;sleep 10s;./gradlew ml-data-hub:test;sleep 10s;./gradlew web:test;sleep 10s;./gradlew marklogic-data-hub:testBootstrap;sleep 10s;./gradlew ml-data-hub:testFullCycle;"'
@@ -535,7 +535,7 @@ pipeline{
535535
}
536536
}
537537
stage('w12_cluster_10.0-2'){
538-
agent { label 'master'}
538+
agent { label 'dhmaster'}
539539
steps{
540540
script{
541541
def Returnresult=build job: '/5.x/dhf-core-5.x-develop-winserver2012-cluster_10.0-2', propagate: false
@@ -565,7 +565,7 @@ pipeline{
565565
}
566566
}
567567
stage('w12_cluster_9.0-10'){
568-
agent { label 'master'}
568+
agent { label 'dhmaster'}
569569
steps{
570570
script{
571571
def Returnresult=build job: '/5.x/dhf-core-5.x-develop-winserver2012-cluster_9.0-10', propagate: false
@@ -595,7 +595,7 @@ pipeline{
595595
}
596596
}
597597
stage('w12_cluster'){
598-
agent { label 'master'}
598+
agent { label 'dhmaster'}
599599
steps{
600600
script{
601601
def Returnresult=build job: '/5.x/dhf-core-5.x-develop-winserver2012-cluster', propagate: false
@@ -625,7 +625,7 @@ pipeline{
625625
}
626626
}
627627
stage('qs_rh7_singlenode'){
628-
agent { label 'master'}
628+
agent { label 'dhmaster'}
629629
steps{
630630
script{
631631
def Returnresult=build job: '/5.x/NO_CI_dhf-qs-5.x-develop-rh7', propagate: false
@@ -666,7 +666,7 @@ pipeline{
666666
branch '5.x-develop'
667667
beforeAgent true
668668
}
669-
agent {label 'master'}
669+
agent {label 'dhmaster'}
670670
steps{
671671
withCredentials([usernameColonPassword(credentialsId: '550650ab-ee92-4d31-a3f4-91a11d5388a3', variable: 'Credentials')]) {
672672
script{
@@ -713,7 +713,7 @@ pipeline{
713713
}
714714
agent { label 'dhfLinuxAgent'}
715715
steps{
716-
copyRPM 'Release','9.0-10'
716+
copyRPM 'Release','9.0-10.4'
717717
setUpML '$WORKSPACE/xdmp/src/Mark*.rpm'
718718
sh 'export JAVA_HOME=`eval echo "$JAVA_HOME_DIR"`;export GRADLE_USER_HOME=$WORKSPACE$GRADLE_DIR;export M2_HOME=$MAVEN_HOME/bin;export PATH=$GRADLE_USER_HOME:$PATH:$MAVEN_HOME/bin;cd $WORKSPACE/data-hub;rm -rf $GRADLE_USER_HOME/caches;./gradlew clean;./gradlew clean;./gradlew marklogic-data-hub:test;sleep 10s;./gradlew ml-data-hub:test;sleep 10s;./gradlew web:test;'
719719
junit '**/TEST-*.xml'

0 commit comments

Comments
 (0)