Skip to content

Commit 0cf2e3b

Browse files
Yakov FeldmanMarkLogic Builder
authored andcommitted
DEVO-191:Update DHF develop pipeline to include HC on-prem
1 parent ec5c978 commit 0cf2e3b

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Jenkinsfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,7 @@ void cypressE2EOnPremLinuxTests(String type,String mlVersion){
545545
cd $WORKSPACE/data-hub
546546
./gradlew -g ./cache-build clean publishToMavenLocal -Dmaven.repo.local=$M2_LOCAL_REPO
547547
cd $WORKSPACE/data-hub/marklogic-data-hub-central/ui/e2e
548-
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 ./cache-build #g" setup.sh
549549
./setup.sh dhs=false mlHost=$HOSTNAME mlSecurityUsername=admin mlSecurityPassword=admin
550550
npm run cy:run 2>&1 |& tee -a e2e_err.log
551551
@@ -574,7 +574,7 @@ void cypressE2EOnPremMacTests(String type,String mlVersion){
574574
cd $WORKSPACE/data-hub
575575
./gradlew -g ./cache-build clean publishToMavenLocal -Dmaven.repo.local=$M2_LOCAL_REPO
576576
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
577+
sed -i '.bak' "s#gradlew #gradlew -Dmaven.repo.local=$M2_LOCAL_REPO -g ./cache-build #g" setup.sh
578578
./setup.sh dhs=false mlHost=$HOSTNAME mlSecurityUsername=admin mlSecurityPassword=admin
579579
npm run cy:run 2>&1 | tee -a e2e_err.log
580580
@@ -610,7 +610,7 @@ void cypressE2EOnPremWinTests(String type,String mlVersion){
610610
timeout(10) {waitUntil initialRecurrencePeriod: 15000, { bat(script: 'jps | grep war', returnStatus: true) == 0 }}
611611

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

616616
junit '**/e2e/**/*.xml'

0 commit comments

Comments
 (0)