Skip to content

Commit c1b6ef3

Browse files
CLD-792 pipeline fix hc tests (#139)
- update the environment in order to be able to cleanup gradle lock files - disable schedule HC tests
1 parent 1dd50f5 commit c1b6ef3

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ pipeline {
164164
skipStagesAfterUnstable()
165165
}
166166
triggers {
167-
parameterizedCron( env.BRANCH_NAME == 'develop' ? '''00 04 * * *%HC_TESTS=true''' : '')
167+
parameterizedCron( env.BRANCH_NAME == 'develop' ? '''00 04 * * *''' : '')
168168
}
169169
environment {
170170
timeStamp = sh(returnStdout: true, script: "date +%Y%m%d -d '-5 hours'").trim()

makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,8 @@ hc-test:
135135
@echo "=====Finalize test report"
136136
mkdir -p ./test/test_results
137137
cp ./marklogic-data-hub/marklogic-data-hub-central/ui/e2e/results/* ./test/test_results/
138-
rm -rf marklogic-data-hub
138+
rm -rf marklogic-data-hub/*
139+
rm -rf marklogic-data-hub || ( ls -a marklogic-data-hub && exit 1 )
139140

140141
@echo "=====Uninstall helm"
141142
helm uninstall hc

test/hc_e2e.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,17 @@
22
#This helper script will run E2E UI tests for Hub Central (https://github.com/marklogic/marklogic-data-hub/tree/develop/marklogic-data-hub-central/ui/e2e)
33

44
#override java and node version for Jenkins
5-
[[ $USER = 'builder' ]] && { export PATH=/home/builder/java/jdk1.8.0_201/bin:/home/builder/nodeJs/node-v16.19.1-linux-x64/bin/:$PATH; unset JAVA_HOME; }
5+
[[ $USER = 'builder' ]] && { export PATH=/home/builder/java/jdk1.8.0_201/bin:/home/builder/nodeJs/node-v14.15.4-linux-x64/bin/:$PATH; unset JAVA_HOME; }
66

77
echo "---- start port forwarding ----"
88
kubectl port-forward hc-marklogic-0 8000 8001 8002 8010 8011 8013 &> /dev/null &
99
forwarderPID=$!
1010

1111
echo "---- configure environment ----"
1212
cd marklogic-data-hub/
13+
rm -rf .gradle/
14+
mkdir .gradle
15+
export GRADLE_USER_HOME=$PWD/.gradle
1316
./gradlew clean build -x test
1417
./gradlew publishToMavenLocal -PskipWeb=true
1518
cd marklogic-data-hub-central/ui/e2e
@@ -26,5 +29,7 @@ echo "---- start UI sanity tests on HC ----"
2629
cd marklogic-data-hub-central/ui/e2e
2730
npm run cy:run --reporter junit --reporter-options "toConsole=false"
2831

29-
echo "---- cleanup background processes ----"
32+
echo "---- cleanup resources ----"
3033
kill $bootRunPID $forwarderPID
34+
rm -rf ${GRADLE_USER_HOME}/*
35+
rm -rf ${GRADLE_USER_HOME}/ || ( ls -a ${GRADLE_USER_HOME} && exit 1 )

0 commit comments

Comments
 (0)