Skip to content

Commit 4eaa6f1

Browse files
committed
Updates pipeline with v1.1.3
1 parent 2959470 commit 4eaa6f1

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

Jenkinsfile

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
def pipelineVersion='1.1.1'
1+
def pipelineVersion='1.1.3'
22
println "Pipeline version: ${pipelineVersion}"
33
/*
44
* This is a vanilla Jenkins pipeline that relies on the Jenkins kubernetes plugin to dynamically provision agents for
@@ -226,8 +226,10 @@ spec:
226226
git fetch --tags
227227
git tag -l
228228
229+
COMMIT_HASH=$(git rev-parse HEAD)
229230
git checkout -b ${BRANCH} --track origin/${BRANCH}
230231
git branch --set-upstream-to=origin/${BRANCH} ${BRANCH}
232+
git reset --hard ${COMMIT_HASH}
231233
232234
git config --global user.name "Jenkins Pipeline"
233235
git config --global user.email "[email protected]"
@@ -372,10 +374,12 @@ spec:
372374
373375
# sleep for 10 seconds to allow enough time for the server to start
374376
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
376379
sleep 30
380+
echo "Health check failure. Remaining retries: $sleep_countdown"
377381
sleep_countdown=$((sleep_countdown-1))
378-
if [ sleep_countdown=0 ]; then
382+
if [[ $sleep_countdown -eq 0 ]]; then
379383
echo "Could not reach health endpoint: ${URL}/health"
380384
exit 1;
381385
fi

chart/base/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ apiVersion: v1
22
appVersion: "1.0"
33
description: A Helm chart for Kubernetes
44
name: base
5-
version: 1.1.1
5+
version: 1.1.3
66
branch: dev

pipeline.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: 1.1.1
1+
version: 1.1.3
22
name: nodejs
33
runtime: nodejs
44
build-tool: node

0 commit comments

Comments
 (0)