Skip to content

Commit 3c5e7bc

Browse files
Ryan DewSameeraPriyathamTadikonda
Ryan Dew
authored and
SameeraPriyathamTadikonda
committed
Merge in code for DH 4.3.3
1 parent ca6212b commit 3c5e7bc

File tree

1,630 files changed

+19069
-85440
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,630 files changed

+19069
-85440
lines changed

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ releases/
1414
.classpath
1515
.project
1616
gradle-local.properties
17+
gradle-aws.properties
1718
environment.properties
1819
assetInstallTime.properties
1920
/quick-start/input
@@ -29,3 +30,7 @@ node_modules/
2930
*.db
3031
ye-olde-project
3132
/bin/
33+
local-testing/test1
34+
local-testing/mnt
35+
gradle-aws2.properties
36+
.java-version

‎Jenkinsfile‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ pipeline{
2525
DMC_USER = credentials('MLBUILD_USER')
2626
DMC_PASSWORD= credentials('MLBUILD_PASSWORD')
2727
}
28-
parameters{
28+
parameters{
2929
string(name: 'Email', defaultValue: '[email protected],[email protected],[email protected],[email protected]', description: 'Who should I say send the email to?')
3030
}
3131
stages{
@@ -50,7 +50,7 @@ pipeline{
5050
def email;
5151
if(env.CHANGE_AUTHOR){
5252
def author=env.CHANGE_AUTHOR.toString().trim().toLowerCase()
53-
email=getEmailFromGITUser author
53+
email=getEmailFromGITUser author
5454
}else{
5555
email=Email
5656
}
@@ -62,7 +62,7 @@ pipeline{
6262
stage('Unit-Tests'){
6363
agent { label 'dhfLinuxAgent'}
6464
steps{
65-
copyRPM 'Release','9.0-10'
65+
copyRPM 'Release','11.3.0'
6666
setUpML '$WORKSPACE/xdmp/src/Mark*.rpm'
6767
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 quick-start:test;'
6868
junit '**/TEST-*.xml'
@@ -98,7 +98,7 @@ pipeline{
9898
def email;
9999
if(env.CHANGE_AUTHOR){
100100
def author=env.CHANGE_AUTHOR.toString().trim().toLowerCase()
101-
email=getEmailFromGITUser author
101+
email=getEmailFromGITUser author
102102
}else{
103103
email=Email
104104
}
@@ -133,7 +133,7 @@ pipeline{
133133
emailList+=email+',';
134134
}
135135
sendMail emailList,'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 $BRANCH_NAME is waiting for the code-review to complete. Please click on proceed button if all the reviewers approved the code here. \n\n ${BUILD_URL}input ',false,'Waiting for code review $BRANCH_NAME '
136-
136+
137137
}
138138
}
139139
try{
@@ -184,7 +184,7 @@ pipeline{
184184
emailList+=email+',';
185185
}
186186
sendMail emailList,'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 $BRANCH_NAME is waiting for the code-review to complete. Please click on proceed button if all the reviewers approved the code here. \n\n ${BUILD_URL}input ',false,'Waiting for code review $BRANCH_NAME '
187-
187+
188188
}
189189
sleep time: 30, unit: 'MINUTES'
190190
throw new Exception("Waiting for all the status checks to pass");
@@ -213,15 +213,15 @@ pipeline{
213213
println("Merge Successful")
214214
script{
215215
def author=env.CHANGE_AUTHOR.toString().trim().toLowerCase()
216-
def email=getEmailFromGITUser author
216+
def email=getEmailFromGITUser author
217217
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 $BRANCH_NAME is merged and it will run the end to end tests in the next stage',false,' $BRANCH_NAME is Merged'
218218
}
219219
}
220220
failure {
221221
println("Retried 5times")
222222
script{
223223
def author=env.CHANGE_AUTHOR.toString().trim().toLowerCase()
224-
def email=getEmailFromGITUser author
224+
def email=getEmailFromGITUser author
225225
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 $BRANCH_NAME is not merged into the target branch. Please check the merge status of the PR if there are any merge conflicts or if the code is not reviewed. \n\n Click on the link Restart PR below to retry merge if the merge state is clean i.e., Code is reviewed and there are no merge conflicts with the target branch. \n\n ${JENKINS_URL}/blue/organizations/jenkins/Datahub_CI/detail/$JOB_BASE_NAME/$BUILD_ID',false,' $BRANCH_NAME Cannot be Merged'
226226
}
227227
}
@@ -233,7 +233,7 @@ pipeline{
233233
}
234234
agent { label 'dhfLinuxAgent'}
235235
steps{
236-
copyRPM 'Release','9.0-10'
236+
copyRPM 'Release','11.3.0'
237237
setUpML '$WORKSPACE/xdmp/src/Mark*.rpm'
238238
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;set +e;./gradlew marklogic-data-hub:test -Dorg.gradle.jvmargs=-Xmx1g;sleep 10s;./gradlew ml-data-hub:test;sleep 10s;./gradlew quick-start:test;sleep 10s;./gradlew marklogic-data-hub:testBootstrap -Pskipui=true;sleep 10s;./gradlew clean;./gradlew ml-data-hub:testFullCycle -Pskipui=true;'
239239
junit '**/TEST-*.xml'
@@ -255,7 +255,7 @@ pipeline{
255255
success {
256256
println("End-End Tests Completed")
257257
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 of the branch $BRANCH_NAME passed and the next stage is to run all the end-end tests on multiple platforms in parallel',false,'rh7-singlenode Tests for $BRANCH_NAME Passed'
258-
258+
259259
}
260260
failure {
261261
println("End-End Tests Failed")
@@ -306,7 +306,7 @@ pipeline{
306306
}
307307
failure {
308308
println("Creation of Automated PR Failed")
309-
309+
310310
}
311311
}
312312
}
@@ -318,7 +318,7 @@ pipeline{
318318
parallel{
319319
stage('rh7_cluster_9.0-7'){
320320
agent { label 'dhfLinuxAgent'}
321-
steps{
321+
steps{
322322
copyRPM 'Release','9.0-7'
323323
script{
324324
def dockerhost=setupMLDockerCluster 3
@@ -354,7 +354,7 @@ pipeline{
354354
}
355355
stage('rh7_cluster_9.0-8'){
356356
agent { label 'dhfLinuxAgent'}
357-
steps{
357+
steps{
358358
copyRPM 'Release','9.0-8'
359359
script{
360360
def dockerhost=setupMLDockerCluster 3
@@ -390,7 +390,7 @@ pipeline{
390390
}
391391
stage('rh7_cluster_9.0-9'){
392392
agent { label 'dhfLinuxAgent'}
393-
steps{
393+
steps{
394394
copyRPM 'Release','9.0-9'
395395
script{
396396
def dockerhost=setupMLDockerCluster 3
@@ -424,11 +424,11 @@ pipeline{
424424
}
425425
}
426426
}
427-
stage('w12_cluster_9.0-10'){
427+
stage('w12_cluster_11.3.0'){
428428
agent { label 'master'}
429-
steps{
429+
steps{
430430
script{
431-
def Returnresult=build job: '/4.x/dhf-core-4.x-develop-winserver2012-cluster_9.0-10', propagate: false
431+
def Returnresult=build job: '/4.x/dhf-core-4.x-develop-winserver2012-cluster_11.3.0', propagate: false
432432
currentBuild.result=Returnresult.result;
433433
commitMessage = sh (returnStdout: true, script:'''
434434
curl -u $Credentials -X GET "'''+githubAPIUrl+'''/git/commits/${GIT_COMMIT}" ''')
@@ -437,26 +437,26 @@ pipeline{
437437
JIRA_ID=commit.split(("\\n"))[0].split(':')[0].trim();
438438
JIRA_ID=JIRA_ID.split(" ")[0];
439439
commitMessage=null;
440-
//jiraAddComment comment: 'Jenkins w12_cluster_9.0-10 Test Results For PR Available', idOrKey: JIRA_ID, site: 'JIRA'
440+
//jiraAddComment comment: 'Jenkins w12_cluster_11.3.0 Test Results For PR Available', idOrKey: JIRA_ID, site: 'JIRA'
441441
}
442442
}
443443
post{
444444
always{
445445
sh 'rm -rf $WORKSPACE/xdmp'
446446
}
447447
success {
448-
println("w12_cluster_9.0-10 Tests Completed")
449-
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'
448+
println("w12_cluster_11.3.0 Tests Completed")
449+
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 11.3.0 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_11.3.0 Tests for $BRANCH_NAME Passed'
450450
}
451451
failure {
452-
println("w12_cluster_9.0-10 Tests Failed")
453-
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'
452+
println("w12_cluster_11.3.0 Tests Failed")
453+
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 11.3.0 w2k12 cluster failed. Please fix the tests and create a PR or create a bug for the failures.',false,'w12_cluster_11.3.0 Tests for $BRANCH_NAME Failed'
454454
}
455455
}
456456
}
457457
stage('qs_rh7_singlenode'){
458458
agent { label 'master'}
459-
steps{
459+
steps{
460460
script{
461461
def Returnresult=build job: '/4.x/NO_CI_dhf-qs-4.x-develop-rh7', propagate: false
462462
currentBuild.result=Returnresult.result;
@@ -471,7 +471,7 @@ pipeline{
471471
}
472472
}
473473
post{
474-
474+
475475
success {
476476
println("qs_rh7_singlenode Tests Completed")
477477
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 quick start tests on Rh7 single node 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,'qs_rh7_singlenode Tests for $BRANCH_NAME Passed'
@@ -484,7 +484,7 @@ pipeline{
484484
}
485485
stage('qs_w12_singlenode'){
486486
agent { label 'master'}
487-
steps{
487+
steps{
488488
script{
489489
def Returnresult=build job: '/4.x/NO_CI_dhf-qs-4.x-develop-winserver2012', propagate: false
490490
currentBuild.result=Returnresult.result;
@@ -559,7 +559,7 @@ pipeline{
559559
post{
560560
success {
561561
println("Automated PR For Release branch created")
562-
562+
563563
}
564564
failure {
565565
println("Creation of Automated PR Failed")
@@ -573,7 +573,7 @@ pipeline{
573573
}
574574
agent { label 'dhfLinuxAgent'}
575575
steps{
576-
copyRPM 'Release','9.0-10'
576+
copyRPM 'Release','11.3.0'
577577
setUpML '$WORKSPACE/xdmp/src/Mark*.rpm'
578578
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 quick-start:test;'
579579
junit '**/TEST-*.xml'
@@ -612,4 +612,4 @@ pipeline{
612612
}
613613
}
614614
}
615-
}
615+
}

‎build.gradle‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,21 @@ subprojects {
2323

2424

2525
dependencies {
26-
testCompile group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.3.1'
27-
testCompile 'org.apache.httpcomponents:httpclient:4.3.5'
26+
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.3.1'
27+
testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
2828
}
2929

30-
test{
31-
testLogging{
32-
events 'started','passed', 'skipped', 'failed'
30+
test {
31+
testLogging {
32+
events 'started', 'passed', 'skipped', 'failed'
3333
exceptionFormat 'full'
3434
}
3535
}
3636

3737
}
3838

3939
wrapper {
40-
gradleVersion = '4.10'
40+
gradleVersion = '7.6'
4141
}
4242

4343
//Task to update versions in files they are hardcoded. If version is hardcoded in any other files in the future,it has to be added to the list

‎examples/DHS-e2e/DHS/build.gradle‎

Lines changed: 0 additions & 77 deletions
This file was deleted.

‎examples/DHS-e2e/DHS/gradle.properties‎

Lines changed: 0 additions & 49 deletions
This file was deleted.

0 commit comments

Comments
 (0)