Skip to content

Commit fef9f3c

Browse files
Yakov FeldmanMarkLogic Builder
Yakov Feldman
authored and
MarkLogic Builder
committed
DEVO-191:Update DHF develop pipeline to include HC on-prem
1 parent 258315b commit fef9f3c

File tree

1 file changed

+31
-28
lines changed

1 file changed

+31
-28
lines changed

‎Jenkinsfile‎

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -539,16 +539,17 @@ void cypressE2EOnPremLinuxTests(String type,String mlVersion){
539539
timeout(10) {waitUntil initialRecurrencePeriod: 15000, { sh(script: 'ps aux | grep ".central.*\\.war" | grep -v grep | grep -v timeout', returnStatus: true) == 0 }}
540540

541541
sh '''
542+
543+
export NODE_HOME=$NODE_HOME_DIR/bin;
544+
export PATH=$NODE_HOME:$JAVA_HOME/bin:$PATH
542545
cd $WORKSPACE/data-hub
543546
./gradlew -g ./cache-build clean publishToMavenLocal -Dmaven.repo.local=$M2_LOCAL_REPO
544547
cd $WORKSPACE/data-hub/marklogic-data-hub-central/ui/e2e
545-
sed -i 's/gradlew /gradlew -Dmaven.repo.local=$M2_LOCAL_REPO /g' setup.sh
548+
sed -i "s#gradlew #gradlew -Dmaven.repo.local=$M2_LOCAL_REPO #g" setup.sh
546549
./setup.sh dhs=false mlHost=$HOSTNAME mlSecurityUsername=admin mlSecurityPassword=admin
550+
npm run cy:run 2>&1 |& tee -a e2e_err.log
547551
548-
export NODE_HOME=$NODE_HOME_DIR/bin;
549-
export PATH=$NODE_HOME:$JAVA_HOME/bin:$PATH
550-
npm run cy:run |& tee -a e2e_err.log
551-
'''
552+
'''
552553

553554
junit '**/e2e/**/*.xml'
554555
}
@@ -567,14 +568,16 @@ void cypressE2EOnPremMacTests(String type,String mlVersion){
567568
//wait for prem to start
568569
timeout(10) {waitUntil initialRecurrencePeriod: 15000, { sh(script: 'ps aux | grep ".central.*\\.war" | grep -v grep | grep -v timeout', returnStatus: true) == 0 }}
569570

570-
571571
sh '''
572+
573+
export PATH=/usr/local/bin/:$JAVA_HOME/bin:$PATH
572574
cd $WORKSPACE/data-hub
573575
./gradlew -g ./cache-build clean publishToMavenLocal -Dmaven.repo.local=$M2_LOCAL_REPO
574576
cd $WORKSPACE/data-hub/marklogic-data-hub-central/ui/e2e
577+
sed -i '.bak' "s#gradlew #gradlew -Dmaven.repo.local=$M2_LOCAL_REPO #g" setup.sh
575578
./setup.sh dhs=false mlHost=$HOSTNAME mlSecurityUsername=admin mlSecurityPassword=admin
576-
export PATH=/usr/local/bin/:$JAVA_HOME/bin:$PATH
577579
npm run cy:run 2>&1 | tee -a e2e_err.log
580+
578581
'''
579582

580583
junit '**/e2e/**/*.xml'
@@ -607,7 +610,7 @@ void cypressE2EOnPremWinTests(String type,String mlVersion){
607610
timeout(10) {waitUntil initialRecurrencePeriod: 15000, { bat(script: 'jps | grep war', returnStatus: true) == 0 }}
608611

609612
bat "cd $WORKSPACE/data-hub & gradlew.bat -g ./cache-build clean publishToMavenLocal -Dmaven.repo.local=$M2_LOCAL_REPO"
610-
bat "cd $WORKSPACE/data-hub/marklogic-data-hub-central/ui/e2e &sed -i 's/gradlew /gradlew -Dmaven.repo.local=$M2_LOCAL_REPO /g' setup.sh &sh setup.sh dhs=false mlHost=%COMPUTERNAME% mlSecurityUsername=admin mlSecurityPassword=admin"
613+
bat "cd $WORKSPACE/data-hub/marklogic-data-hub-central/ui/e2e &sed -i 's#gradlew #gradlew -Dmaven.repo.local=$M2_LOCAL_REPO #g' setup.sh &sh setup.sh dhs=false mlHost=%COMPUTERNAME% mlSecurityUsername=admin mlSecurityPassword=admin"
611614
bat "cd $WORKSPACE/data-hub/marklogic-data-hub-central/ui/e2e & npm run cy:run 2>&1 | tee -a e2e_err.log"
612615

613616
junit '**/e2e/**/*.xml'
@@ -915,7 +918,7 @@ pipeline{
915918
agent { label 'dhfLinuxAgent'}
916919
steps{
917920
timeout(time: 3, unit: 'HOURS'){
918-
catchError(buildResult: 'SUCCESS', catchInterruptions: true) {
921+
catchError(buildResult: 'SUCCESS', catchInterruptions: true, stageResult: 'FAILURE') {
919922
script{
920923
props = readProperties file:'data-hub/pipeline.properties';
921924
copyRPM 'Release','9.0-11'
@@ -957,7 +960,7 @@ pipeline{
957960
agent { label 'dhfLinuxAgent'}
958961
steps{
959962
timeout(time: 3, unit: 'HOURS'){
960-
catchError(buildResult: 'SUCCESS', catchInterruptions: true){dhflinuxTests("10.0","Latest")}
963+
catchError(buildResult: 'SUCCESS', catchInterruptions: true, stageResult: 'FAILURE'){dhflinuxTests("10.0","Latest")}
961964
}}
962965
post{
963966
always{
@@ -978,7 +981,7 @@ pipeline{
978981
agent { label 'dhfLinuxAgent'}
979982
steps{
980983
timeout(time: 3, unit: 'HOURS'){
981-
catchError(buildResult: 'SUCCESS', catchInterruptions: true){dhflinuxTests("9.0","Latest")}
984+
catchError(buildResult: 'SUCCESS', catchInterruptions: true, stageResult: 'FAILURE'){dhflinuxTests("9.0","Latest")}
982985
}}
983986
post{
984987
always{
@@ -998,7 +1001,7 @@ pipeline{
9981001
agent { label 'dhfLinuxAgent'}
9991002
steps{
10001003
timeout(time: 3, unit: 'HOURS'){
1001-
catchError(buildResult: 'SUCCESS', catchInterruptions: true){dhflinuxTests("9.0-11","Release")}
1004+
catchError(buildResult: 'SUCCESS', catchInterruptions: true, stageResult: 'FAILURE'){dhflinuxTests("9.0-11","Release")}
10021005
}}
10031006
post{
10041007
always{
@@ -1017,7 +1020,7 @@ pipeline{
10171020
agent { label 'dhfLinuxAgent'}
10181021
steps{
10191022
timeout(time: 3, unit: 'HOURS'){
1020-
catchError(buildResult: 'SUCCESS', catchInterruptions: true){dhflinuxTests("10.0-3","Release")}
1023+
catchError(buildResult: 'SUCCESS', catchInterruptions: true, stageResult: 'FAILURE'){dhflinuxTests("10.0-3","Release")}
10211024
}}
10221025
post{
10231026
always{
@@ -1037,7 +1040,7 @@ pipeline{
10371040
agent { label 'dhfLinuxAgent'}
10381041
steps{
10391042
timeout(time: 3, unit: 'HOURS'){
1040-
catchError(buildResult: 'SUCCESS', catchInterruptions: true){dhflinuxTests("10.0-4.4","Release")}
1043+
catchError(buildResult: 'SUCCESS', catchInterruptions: true, stageResult: 'FAILURE'){dhflinuxTests("10.0-4.4","Release")}
10411044
}}
10421045
post{
10431046
always{
@@ -1057,7 +1060,7 @@ pipeline{
10571060
agent { label 'dhfLinuxAgent'}
10581061
steps{
10591062
timeout(time: 3, unit: 'HOURS'){
1060-
catchError(buildResult: 'SUCCESS', catchInterruptions: true){dhflinuxTests("10.0-5.3","Release")}
1063+
catchError(buildResult: 'SUCCESS', catchInterruptions: true, stageResult: 'FAILURE'){dhflinuxTests("10.0-5.3","Release")}
10611064
}}
10621065
post{
10631066
always{
@@ -1077,7 +1080,7 @@ pipeline{
10771080
agent { label 'dhfLinuxAgent'}
10781081
steps{
10791082
timeout(time: 3, unit: 'HOURS'){
1080-
catchError(buildResult: 'SUCCESS', catchInterruptions: true){dhflinuxTests("10.0-6","Release")}
1083+
catchError(buildResult: 'SUCCESS', catchInterruptions: true, stageResult: 'FAILURE'){dhflinuxTests("10.0-6","Release")}
10811084
}}
10821085
post{
10831086
always{
@@ -1103,7 +1106,7 @@ pipeline{
11031106
agent { label 'dhfLinuxAgent'}
11041107
steps {
11051108
timeout(time: 3, unit: 'HOURS'){
1106-
catchError(buildResult: 'SUCCESS', catchInterruptions: true){dh5Example()}
1109+
catchError(buildResult: 'SUCCESS', catchInterruptions: true, stageResult: 'FAILURE'){dh5Example()}
11071110
}}
11081111
post{
11091112
always{
@@ -1121,7 +1124,7 @@ pipeline{
11211124
agent { label 'dhfLinuxAgent'}
11221125
steps{
11231126
timeout(time: 3, unit: 'HOURS'){
1124-
catchError(buildResult: 'SUCCESS', catchInterruptions: true){dhCustomHook()}
1127+
catchError(buildResult: 'SUCCESS', catchInterruptions: true, stageResult: 'FAILURE'){dhCustomHook()}
11251128
}}
11261129
post{
11271130
always{
@@ -1139,7 +1142,7 @@ pipeline{
11391142
agent { label 'dhfLinuxAgent'}
11401143
steps{
11411144
timeout(time: 3, unit: 'HOURS'){
1142-
catchError(buildResult: 'SUCCESS', catchInterruptions: true){mappingExample()}
1145+
catchError(buildResult: 'SUCCESS', catchInterruptions: true, stageResult: 'FAILURE'){mappingExample()}
11431146
}}
11441147
post{
11451148
always{
@@ -1157,7 +1160,7 @@ pipeline{
11571160
agent { label 'dhfLinuxAgent'}
11581161
steps{
11591162
timeout(time: 3, unit: 'HOURS'){
1160-
catchError(buildResult: 'SUCCESS', catchInterruptions: true){smartMastering()}
1163+
catchError(buildResult: 'SUCCESS', catchInterruptions: true, stageResult: 'FAILURE'){smartMastering()}
11611164
}}
11621165
post{
11631166
always{
@@ -1180,7 +1183,7 @@ pipeline{
11801183
agent { label 'dhfWinagent'}
11811184
steps{
11821185
timeout(time: 3, unit: 'HOURS'){
1183-
catchError(buildResult: 'SUCCESS', catchInterruptions: true){dhfWinTests("9.0","Latest")}
1186+
catchError(buildResult: 'SUCCESS', catchInterruptions: true, stageResult: 'FAILURE'){dhfWinTests("9.0","Latest")}
11841187
}}
11851188
post{
11861189
always{
@@ -1200,7 +1203,7 @@ pipeline{
12001203
agent { label 'dhfWinagent'}
12011204
steps{
12021205
timeout(time: 3, unit: 'HOURS'){
1203-
catchError(buildResult: 'SUCCESS', catchInterruptions: true){dhfWinTests("10.0","Latest")}
1206+
catchError(buildResult: 'SUCCESS', catchInterruptions: true, stageResult: 'FAILURE'){dhfWinTests("10.0","Latest")}
12041207
}}
12051208
post{
12061209
always{
@@ -1220,7 +1223,7 @@ pipeline{
12201223
agent { label 'dhfWinagent'}
12211224
steps{
12221225
timeout(time: 3, unit: 'HOURS'){
1223-
catchError(buildResult: 'SUCCESS', catchInterruptions: true){dhfWinTests("9.0-11","Release")}
1226+
catchError(buildResult: 'SUCCESS', catchInterruptions: true, stageResult: 'FAILURE'){dhfWinTests("9.0-11","Release")}
12241227
}}
12251228
post{
12261229
always{
@@ -1240,7 +1243,7 @@ pipeline{
12401243
agent { label 'dhfWinCluster'}
12411244
steps{
12421245
timeout(time: 3, unit: 'HOURS'){
1243-
catchError(buildResult: 'SUCCESS', catchInterruptions: true){winParallel()}
1246+
catchError(buildResult: 'SUCCESS', catchInterruptions: true, stageResult: 'FAILURE'){winParallel()}
12441247
}}
12451248
post{
12461249
always{
@@ -1272,7 +1275,7 @@ pipeline{
12721275
}
12731276
steps {
12741277
timeout(time: 3, unit: 'HOURS'){
1275-
catchError(buildResult: 'SUCCESS', catchInterruptions: true) { cypressE2EOnPremLinuxTests("Latest", "10.0") }
1278+
catchError(buildResult: 'SUCCESS', catchInterruptions: true, stageResult: 'FAILURE') { cypressE2EOnPremLinuxTests("Latest", "10.0") }
12761279
}}
12771280
post{
12781281
success {
@@ -1296,7 +1299,7 @@ pipeline{
12961299
}
12971300
steps{
12981301
timeout(time: 3, unit: 'HOURS'){
1299-
catchError(buildResult: 'SUCCESS', catchInterruptions: true){cypressE2EOnPremWinTests("Release","10.0-6.2")}
1302+
catchError(buildResult: 'SUCCESS', catchInterruptions: true, stageResult: 'FAILURE'){cypressE2EOnPremWinTests("Release","10.0-6.2")}
13001303
}}
13011304
post{
13021305
success {
@@ -1318,7 +1321,7 @@ pipeline{
13181321
}
13191322
steps{
13201323
timeout(time: 3, unit: 'HOURS'){
1321-
catchError(buildResult: 'SUCCESS', catchInterruptions: true){cypressE2EOnPremMacTests("Release","10.0-3")}
1324+
catchError(buildResult: 'SUCCESS', catchInterruptions: true, stageResult: 'FAILURE'){cypressE2EOnPremMacTests("Release","10.0-3")}
13221325
}}
13231326
post{
13241327
success {
@@ -1343,7 +1346,7 @@ pipeline{
13431346
13441347
steps{
13451348
timeout(time: 3, unit: 'HOURS'){
1346-
catchError(buildResult: 'SUCCESS', catchInterruptions: true){cypressE2EOnPremWinTests("Release","10.0-3")}
1349+
catchError(buildResult: 'SUCCESS', catchInterruptions: true, stageResult: 'FAILURE'){cypressE2EOnPremWinTests("Release","10.0-3")}
13471350
}}
13481351
post{
13491352
success {

0 commit comments

Comments
 (0)