Skip to content

Commit b1b42e0

Browse files
Removed 9.0-7 and 9.0-8 and added 9.0-10 and 10.0-2 tests
1 parent 3afb878 commit b1b42e0

File tree

1 file changed

+28
-28
lines changed

1 file changed

+28
-28
lines changed

Jenkinsfile

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -423,10 +423,10 @@ pipeline{
423423
}
424424
}
425425
}
426-
stage('rh7_cluster_9.0-7'){
426+
stage('rh7_cluster_9.0-10'){
427427
agent { label 'dhfLinuxAgent'}
428428
steps{
429-
copyRPM 'Release','9.0-7'
429+
copyRPM 'Release','9.0-10'
430430
script{
431431
def dockerhost=setupMLDockerCluster 3
432432
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;"'
@@ -440,29 +440,29 @@ pipeline{
440440
JIRA_ID=commit.split(("\\n"))[0].split(':')[0].trim();
441441
JIRA_ID=JIRA_ID.split(" ")[0];
442442
commitMessage=null;
443-
//jiraAddComment comment: 'Jenkins rh7_cluster_9.0-7 Test Results For PR Available', idOrKey: JIRA_ID, site: 'JIRA'
443+
//jiraAddComment comment: 'Jenkins rh7_cluster_9.0-10 Test Results For PR Available', idOrKey: JIRA_ID, site: 'JIRA'
444444
}
445445
}
446446
post{
447447
always{
448448
sh 'rm -rf $WORKSPACE/xdmp'
449449
}
450450
success {
451-
println("rh7_cluster_9.0-7 Completed")
452-
sendMail Email,'Check the Pipeline View Here: ${JENKINS_URL}/blue/organizations/jenkins/Datahub_CI/detail/$JOB_BASE_NAME/$BUILD_ID \n\n\n Check Console Output Here: ${BUILD_URL}/console \n\n\n All the End to End tests on rh7 cluster 9.0-7 of the branch $BRANCH_NAME passed and the next stage is to merge it to release branch if all the end-end tests pass',false,'rh7_cluster_9.0-7 Tests for $BRANCH_NAME Passed'
451+
println("rh7_cluster_9.0-10 Completed")
452+
sendMail Email,'Check the Pipeline View Here: ${JENKINS_URL}/blue/organizations/jenkins/Datahub_CI/detail/$JOB_BASE_NAME/$BUILD_ID \n\n\n Check Console Output Here: ${BUILD_URL}/console \n\n\n All the End to End tests on rh7 cluster 9.0-10 of the branch $BRANCH_NAME passed and the next stage is to merge it to release branch if all the end-end tests pass',false,'rh7_cluster_9.0-10 Tests for $BRANCH_NAME Passed'
453453
}
454454
unsuccessful {
455-
println("rh7_cluster_9.0-7 Failed")
455+
println("rh7_cluster_9.0-10 Failed")
456456
sh 'mkdir -p MLLogs;cp -r /var/opt/MarkLogic/Logs/* $WORKSPACE/MLLogs/'
457457
archiveArtifacts artifacts: 'MLLogs/**/*'
458-
sendMail Email,'Check the Pipeline View Here: ${JENKINS_URL}/blue/organizations/jenkins/Datahub_CI/detail/$JOB_BASE_NAME/$BUILD_ID \n\n\n Check Console Output Here: ${BUILD_URL}/console \n\n\n Some of the End to End tests of the branch $BRANCH_NAME on 9.0-7 rh7 cluster failed. Please fix the tests and create a PR or create a bug for the failures.',false,'rh7_cluster_9.0-7 Tests for $BRANCH_NAME Failed'
458+
sendMail Email,'Check the Pipeline View Here: ${JENKINS_URL}/blue/organizations/jenkins/Datahub_CI/detail/$JOB_BASE_NAME/$BUILD_ID \n\n\n Check Console Output Here: ${BUILD_URL}/console \n\n\n Some of the End to End tests of the branch $BRANCH_NAME on 9.0-10 rh7 cluster failed. Please fix the tests and create a PR or create a bug for the failures.',false,'rh7_cluster_9.0-10 Tests for $BRANCH_NAME Failed'
459459
}
460460
}
461461
}
462-
stage('rh7_cluster_9.0-8'){
462+
stage('rh7_cluster_10.0-2'){
463463
agent { label 'dhfLinuxAgent'}
464464
steps{
465-
copyRPM 'Release','9.0-8'
465+
copyRPM 'Release','10.0-2'
466466
script{
467467
def dockerhost=setupMLDockerCluster 3
468468
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;"'
@@ -476,22 +476,22 @@ pipeline{
476476
JIRA_ID=commit.split(("\\n"))[0].split(':')[0].trim();
477477
JIRA_ID=JIRA_ID.split(" ")[0];
478478
commitMessage=null;
479-
//jiraAddComment comment: 'Jenkins rh7_cluster_9.0-8 Test Results For PR Available', idOrKey: JIRA_ID, site: 'JIRA'
479+
//jiraAddComment comment: 'Jenkins rh7_cluster_10.0-2 Test Results For PR Available', idOrKey: JIRA_ID, site: 'JIRA'
480480
}
481481
}
482482
post{
483483
always{
484484
sh 'rm -rf $WORKSPACE/xdmp'
485485
}
486486
success {
487-
println("rh7_cluster_9.0-8 Tests Completed")
488-
sendMail Email,'Check the Pipeline View Here: ${JENKINS_URL}/blue/organizations/jenkins/Datahub_CI/detail/$JOB_BASE_NAME/$BUILD_ID \n\n\n Check Console Output Here: ${BUILD_URL}/console \n\n\n All the End to End tests on rh7 cluster 9.0-8 of the branch $BRANCH_NAME passed and the next stage is to merge it to release branch if all the end-end tests pass',false,'rh7_cluster_9.0-8 Tests for $BRANCH_NAME Passed'
487+
println("rh7_cluster_10.0-2 Tests Completed")
488+
sendMail Email,'Check the Pipeline View Here: ${JENKINS_URL}/blue/organizations/jenkins/Datahub_CI/detail/$JOB_BASE_NAME/$BUILD_ID \n\n\n Check Console Output Here: ${BUILD_URL}/console \n\n\n All the End to End tests on rh7 cluster 10.0-2 of the branch $BRANCH_NAME passed and the next stage is to merge it to release branch if all the end-end tests pass',false,'rh7_cluster_10.0-2 Tests for $BRANCH_NAME Passed'
489489
}
490490
unsuccessful {
491-
println("rh7_cluster_9.0-8 Tests Failed")
491+
println("rh7_cluster_10.0-2 Tests Failed")
492492
sh 'mkdir -p MLLogs;cp -r /var/opt/MarkLogic/Logs/* $WORKSPACE/MLLogs/'
493493
archiveArtifacts artifacts: 'MLLogs/**/*'
494-
sendMail Email,'Check the Pipeline View Here: ${JENKINS_URL}/blue/organizations/jenkins/Datahub_CI/detail/$JOB_BASE_NAME/$BUILD_ID \n\n\n Check Console Output Here: ${BUILD_URL}/console \n\n\n Some of the End to End tests of the branch $BRANCH_NAME on 9.0-8 rh7 cluster failed. Please fix the tests and create a PR or create a bug for the failures.',false,'rh7_cluster_9.0-8 Tests for $BRANCH_NAME Failed'
494+
sendMail Email,'Check the Pipeline View Here: ${JENKINS_URL}/blue/organizations/jenkins/Datahub_CI/detail/$JOB_BASE_NAME/$BUILD_ID \n\n\n Check Console Output Here: ${BUILD_URL}/console \n\n\n Some of the End to End tests of the branch $BRANCH_NAME on 10.0-2 rh7 cluster failed. Please fix the tests and create a PR or create a bug for the failures.',false,'rh7_cluster_10.0-2 Tests for $BRANCH_NAME Failed'
495495
}
496496
}
497497
}
@@ -531,11 +531,11 @@ pipeline{
531531
}
532532
}
533533
}
534-
stage('w12_cluster_9.0-8'){
534+
stage('w12_cluster_10.0-2'){
535535
agent { label 'master'}
536536
steps{
537537
script{
538-
def Returnresult=build job: '/5.x/dhf-core-5.x-develop-winserver2012-cluster_9.0-8', propagate: false
538+
def Returnresult=build job: '/5.x/dhf-core-5.x-develop-winserver2012-cluster_10.0-2', propagate: false
539539
currentBuild.result=Returnresult.result;
540540
commitMessage = sh (returnStdout: true, script:'''
541541
curl -u $Credentials -X GET "'''+githubAPIUrl+'''/git/commits/${GIT_COMMIT}" ''')
@@ -544,28 +544,28 @@ pipeline{
544544
JIRA_ID=commit.split(("\\n"))[0].split(':')[0].trim();
545545
JIRA_ID=JIRA_ID.split(" ")[0];
546546
commitMessage=null;
547-
//jiraAddComment comment: 'Jenkins w12_cluster_9.0-8 Test Results For PR Available', idOrKey: JIRA_ID, site: 'JIRA'
547+
//jiraAddComment comment: 'Jenkins w12_cluster_10.0-2 Test Results For PR Available', idOrKey: JIRA_ID, site: 'JIRA'
548548
}
549549
}
550550
post{
551551
always{
552552
sh 'rm -rf $WORKSPACE/xdmp'
553553
}
554554
success {
555-
println("w12_cluster_9.0-8 Tests Completed")
556-
sendMail Email,'Check the Pipeline View Here: ${JENKINS_URL}/blue/organizations/jenkins/Datahub_CI/detail/$JOB_BASE_NAME/$BUILD_ID \n\n\n Check Console Output Here: ${BUILD_URL}/console \n\n\n All the End to End tests on W2k12 cluster 9.0-8 of the branch $BRANCH_NAME passed and the next stage is to merge it to release branch if all the end-end tests pass',false,'w12_cluster_9.0-8 Tests for $BRANCH_NAME Passed'
555+
println("w12_cluster_10.0-2 Tests Completed")
556+
sendMail Email,'Check the Pipeline View Here: ${JENKINS_URL}/blue/organizations/jenkins/Datahub_CI/detail/$JOB_BASE_NAME/$BUILD_ID \n\n\n Check Console Output Here: ${BUILD_URL}/console \n\n\n All the End to End tests on W2k12 cluster 10.0-2 of the branch $BRANCH_NAME passed and the next stage is to merge it to release branch if all the end-end tests pass',false,'w12_cluster_10.0-2 Tests for $BRANCH_NAME Passed'
557557
}
558558
unsuccessful {
559-
println("w12_cluster_9.0-8 Tests Failed")
560-
sendMail Email,'Check the Pipeline View Here: ${JENKINS_URL}/blue/organizations/jenkins/Datahub_CI/detail/$JOB_BASE_NAME/$BUILD_ID \n\n\n Check Console Output Here: ${BUILD_URL}/console \n\n\n Some of the End to End tests of the branch $BRANCH_NAME on 9.0-8 w2k12 cluster failed. Please fix the tests and create a PR or create a bug for the failures.',false,'w12_cluster_9.0-8 Tests for $BRANCH_NAME Failed'
559+
println("w12_cluster_10.0-2 Tests Failed")
560+
sendMail Email,'Check the Pipeline View Here: ${JENKINS_URL}/blue/organizations/jenkins/Datahub_CI/detail/$JOB_BASE_NAME/$BUILD_ID \n\n\n Check Console Output Here: ${BUILD_URL}/console \n\n\n Some of the End to End tests of the branch $BRANCH_NAME on 10.0-2 w2k12 cluster failed. Please fix the tests and create a PR or create a bug for the failures.',false,'w12_cluster_10.0-2 Tests for $BRANCH_NAME Failed'
561561
}
562562
}
563563
}
564-
stage('w12_cluster_9.0-7'){
564+
stage('w12_cluster_9.0-10'){
565565
agent { label 'master'}
566566
steps{
567567
script{
568-
def Returnresult=build job: '/5.x/dhf-core-5.x-develop-winserver2012-cluster_9.0-7', propagate: false
568+
def Returnresult=build job: '/5.x/dhf-core-5.x-develop-winserver2012-cluster_9.0-10', propagate: false
569569
currentBuild.result=Returnresult.result;
570570
commitMessage = sh (returnStdout: true, script:'''
571571
curl -u $Credentials -X GET "'''+githubAPIUrl+'''/git/commits/${GIT_COMMIT}" ''')
@@ -574,20 +574,20 @@ pipeline{
574574
JIRA_ID=commit.split(("\\n"))[0].split(':')[0].trim();
575575
JIRA_ID=JIRA_ID.split(" ")[0];
576576
commitMessage=null;
577-
//jiraAddComment comment: 'Jenkins w12_cluster_9.0-7 Test Results For PR Available', idOrKey: JIRA_ID, site: 'JIRA'
577+
//jiraAddComment comment: 'Jenkins w12_cluster_9.0-10 Test Results For PR Available', idOrKey: JIRA_ID, site: 'JIRA'
578578
}
579579
}
580580
post{
581581
always{
582582
sh 'rm -rf $WORKSPACE/xdmp'
583583
}
584584
success {
585-
println("w12_cluster_9.0-7 Tests Completed")
586-
sendMail Email,'Check the Pipeline View Here: ${JENKINS_URL}/blue/organizations/jenkins/Datahub_CI/detail/$JOB_BASE_NAME/$BUILD_ID \n\n\n Check Console Output Here: ${BUILD_URL}/console \n\n\n All the End to End tests on W2k12 cluster 9.0-7 of the branch $BRANCH_NAME passed and the next stage is to merge it to release branch if all the end-end tests pass',false,'w12_cluster_9.0-7 Tests for $BRANCH_NAME Passed'
585+
println("w12_cluster_9.0-10 Tests Completed")
586+
sendMail Email,'Check the Pipeline View Here: ${JENKINS_URL}/blue/organizations/jenkins/Datahub_CI/detail/$JOB_BASE_NAME/$BUILD_ID \n\n\n Check Console Output Here: ${BUILD_URL}/console \n\n\n All the End to End tests on W2k12 cluster 9.0-10 of the branch $BRANCH_NAME passed and the next stage is to merge it to release branch if all the end-end tests pass',false,'w12_cluster_9.0-10 Tests for $BRANCH_NAME Passed'
587587
}
588588
unsuccessful {
589-
println("w12_cluster_9.0-7 Tests Failed")
590-
sendMail Email,'Check the Pipeline View Here: ${JENKINS_URL}/blue/organizations/jenkins/Datahub_CI/detail/$JOB_BASE_NAME/$BUILD_ID \n\n\n Check Console Output Here: ${BUILD_URL}/console \n\n\n Some of the End to End tests of the branch $BRANCH_NAME on 9.0-7 w2k12 cluster failed. Please fix the tests and create a PR or create a bug for the failures.',false,'w12_cluster_9.0-7 Tests for $BRANCH_NAME Failed'
589+
println("w12_cluster_9.0-10 Tests Failed")
590+
sendMail Email,'Check the Pipeline View Here: ${JENKINS_URL}/blue/organizations/jenkins/Datahub_CI/detail/$JOB_BASE_NAME/$BUILD_ID \n\n\n Check Console Output Here: ${BUILD_URL}/console \n\n\n Some of the End to End tests of the branch $BRANCH_NAME on 9.0-10 w2k12 cluster failed. Please fix the tests and create a PR or create a bug for the failures.',false,'w12_cluster_9.0-10 Tests for $BRANCH_NAME Failed'
591591
}
592592
}
593593
}

0 commit comments

Comments
 (0)