Skip to content

Commit 29f77c4

Browse files
committed
adding set e to block scripts to fail if anything goes bad in them
1 parent 038f0e9 commit 29f77c4

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

roles/generate-jenkins/templates/Jenkinsfile.j2

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,11 +310,12 @@ pipeline {
310310
}
311311
steps {
312312
sh '''#! /bin/bash
313+
set -e
313314
TEMPDIR=$(mktemp -d)
314315
{% if project_name != "docker-jenkins-builder" %}
315316
docker pull linuxserver/jenkins-builder:latest
316317
{% endif %}
317-
docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH={{ ls_branch }} -v ${TEMPDIR}:/ansible/jenkins {% if project_name != "docker-jenkins-builder" %}linuxserver/jenkins-builder:latest{% else %}jenkinslocal:${COMMIT_SHA}-${BUILD_NUMBER}{% endif %}
318+
docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH={{ ls_branch }} -v ${TEMPDIR}:/ansible/jenkins {% if project_name != "docker-jenkins-builder" %}linuxserver/jenkins-builder:latest{% else %}jenkinslocal:${COMMIT_SHA}-${BUILD_NUMBER}{% endif %}
318319
docker pull linuxserver/doc-builder:latest
319320
docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH={{ ls_branch }} -v ${TEMPDIR}:/ansible/readme linuxserver/doc-builder:latest
320321
if [ "$(md5sum ${TEMPDIR}/${LS_REPO}/Jenkinsfile | awk '{ print $1 }')" != "$(md5sum Jenkinsfile | awk '{ print $1 }')" ] || [ "$(md5sum ${TEMPDIR}/${CONTAINER_NAME}/README.md | awk '{ print $1 }')" != "$(md5sum README.md | awk '{ print $1 }')" ]; then
@@ -445,6 +446,7 @@ pipeline {
445446
}
446447
steps {
447448
sh '''#! /bin/bash
449+
set -e
448450
TEMPDIR=$(mktemp -d)
449451
if [ "${MULTIARCH}" == "true" ]; then
450452
LOCAL_CONTAINER=${IMAGE}:amd64-${META_TAG}
@@ -526,6 +528,7 @@ pipeline {
526528
string(credentialsId: 'spaces-secret', variable: 'DO_SECRET')
527529
]) {
528530
sh '''#! /bin/bash
531+
set -e
529532
docker pull lsiodev/ci:latest
530533
if [ "${MULTIARCH}" == "true" ]; then
531534
docker pull lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}

0 commit comments

Comments
 (0)