File tree Expand file tree Collapse file tree 3 files changed +9
-5
lines changed Expand file tree Collapse file tree 3 files changed +9
-5
lines changed Original file line number Diff line number Diff line change 1
- def pipelineVersion= ' 1.1.1 '
1
+ def pipelineVersion= ' 1.1.3 '
2
2
println " Pipeline version: ${ pipelineVersion} "
3
3
/*
4
4
* This is a vanilla Jenkins pipeline that relies on the Jenkins kubernetes plugin to dynamically provision agents for
@@ -226,8 +226,10 @@ spec:
226
226
git fetch --tags
227
227
git tag -l
228
228
229
+ COMMIT_HASH=$(git rev-parse HEAD)
229
230
git checkout -b ${BRANCH} --track origin/${BRANCH}
230
231
git branch --set-upstream-to=origin/${BRANCH} ${BRANCH}
232
+ git reset --hard ${COMMIT_HASH}
231
233
232
234
git config --global user.name "Jenkins Pipeline"
233
235
git config --global user.email "[email protected] "
@@ -372,10 +374,12 @@ spec:
372
374
373
375
# sleep for 10 seconds to allow enough time for the server to start
374
376
sleep 10
375
- while [ $(curl -sL -w "%{http_code}\\ n" "${URL}/health" -o /dev/null --connect-timeout 3 --max-time 5 --retry 3 --retry-max-time 30) != "200" ]; do
377
+ echo "Health check start"
378
+ while [[ $(curl -sL -w "%{http_code}\\ n" "${URL}/health" -o /dev/null --connect-timeout 3 --max-time 5 --retry 3 --retry-max-time 30) != "200" ]]; do
376
379
sleep 30
380
+ echo "Health check failure. Remaining retries: $sleep_countdown"
377
381
sleep_countdown=$((sleep_countdown-1))
378
- if [ sleep_countdown=0 ]; then
382
+ if [[ $ sleep_countdown -eq 0 ] ]; then
379
383
echo "Could not reach health endpoint: ${URL}/health"
380
384
exit 1;
381
385
fi
Original file line number Diff line number Diff line change @@ -2,5 +2,5 @@ apiVersion: v1
2
2
appVersion : " 1.0"
3
3
description : A Helm chart for Kubernetes
4
4
name : base
5
- version : 1.1.1
5
+ version : 1.1.3
6
6
branch : dev
Original file line number Diff line number Diff line change 1
- version : 1.1.1
1
+ version : 1.1.3
2
2
name : nodejs
3
3
runtime : nodejs
4
4
build-tool : node
You can’t perform that action at this time.
0 commit comments