Skip to content

Commit 0b3e95c

Browse files
Updating exec branch, removing 9.0-9 and using 10.0-2.1
1 parent 5d1b973 commit 0b3e95c

File tree

2 files changed

+3
-39
lines changed

2 files changed

+3
-39
lines changed

Jenkinsfile

Lines changed: 2 additions & 38 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 'Prerelease','10.0-2.1_RC'
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'
@@ -396,42 +396,6 @@ pipeline{
396396
}
397397
}
398398
}
399-
stage('rh7_cluster_9.0-9'){
400-
agent { label 'dhfLinuxAgent'}
401-
steps{
402-
script{
403-
props = readProperties file:'data-hub/pipeline.properties';
404-
copyRPM 'Release','9.0-9'
405-
def dockerhost=setupMLDockerCluster 3
406-
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;"'
407-
}
408-
junit '**/TEST-*.xml'
409-
script{
410-
commitMessage = sh (returnStdout: true, script:'''
411-
curl -u $Credentials -X GET "'''+githubAPIUrl+'''/git/commits/${GIT_COMMIT}" ''')
412-
def slurper = new JsonSlurperClassic().parseText(commitMessage.toString().trim())
413-
def commit=slurper.message.toString().trim();
414-
JIRA_ID=commit.split(("\\n"))[0].split(':')[0].trim();
415-
JIRA_ID=JIRA_ID.split(" ")[0];
416-
commitMessage=null;
417-
//jiraAddComment comment: 'Jenkins rh7_cluster_9.0-9 Results For PR Available', idOrKey: JIRA_ID, site: 'JIRA'
418-
}
419-
}
420-
post{
421-
always{
422-
sh 'rm -rf $WORKSPACE/xdmp'
423-
}
424-
success {
425-
println("rh7_cluster_9.0-9 Tests Completed")
426-
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-9 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-9 Tests $BRANCH_NAME Passed'
427-
// sh './gradlew publish'
428-
}
429-
unsuccessful {
430-
println("rh7_cluster_9.0-9 Tests Failed")
431-
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-9 rh7 cluster failed. Please fix the tests and create a PR or create a bug for the failures.',false,'rh7_cluster_9.0-9 Tests for $BRANCH_NAME Failed'
432-
}
433-
}
434-
}
435399
stage('rh7_cluster_9.0-10'){
436400
agent { label 'dhfLinuxAgent'}
437401
steps{
@@ -469,7 +433,7 @@ pipeline{
469433
stage('rh7_cluster_10.0-2'){
470434
agent { label 'dhfLinuxAgent'}
471435
steps{
472-
copyRPM 'Release','10.0-2'
436+
copyRPM 'Prerelease','10.0-2.1_RC'
473437
script{
474438
def dockerhost=setupMLDockerCluster 3
475439
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;"'

pipeline.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
ReleaseBranch:release/5.0.3
2-
ExecutionBranch:5.x-develop
2+
ExecutionBranch:release/5.0.3

0 commit comments

Comments
 (0)