File tree 2 files changed +8
-9
lines changed
roles/generate-jenkins/templates
2 files changed +8
-9
lines changed Original file line number Diff line number Diff line change @@ -216,18 +216,17 @@ pipeline {
216
216
set -e
217
217
TEMPDIR=$(mktemp -d)
218
218
docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=looptest -v ${TEMPDIR}:/ansible/jenkins jenkinslocal:${COMMIT_SHA}-${BUILD_NUMBER}
219
- CURRENTHASH=$(grep -hs ^ " ${TEMPLATED_FILES}" | md5sum | cut -c1-8)
219
+ CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
220
220
cd ${TEMPDIR}/docker-${CONTAINER_NAME}
221
- NEWHASH=$(grep -hs ^ "${TEMPLATED_FILES}" | md5sum | cut -c1-8)
222
- echo "CURRENTHASH IS ${CURRENTHASH} NEWHASH IS ${NEWHASH}"
221
+ NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
223
222
if [[ "${CURRENTHASH}" != "${NEWHASH}" ]]; then
224
223
mkdir -p ${TEMPDIR}/repo
225
224
git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
226
225
git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git checkout -f looptest
227
226
mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github
228
- cp --parents " ${TEMPLATED_FILES}" ${TEMPDIR}/repo/${LS_REPO}/
227
+ cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/
229
228
cd ${TEMPDIR}/repo/${LS_REPO}/
230
- git add " ${TEMPLATED_FILES}"
229
+ git add ${TEMPLATED_FILES}
231
230
git commit -m 'Bot Updating Templated Files'
232
231
git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
233
232
echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
Original file line number Diff line number Diff line change @@ -380,17 +380,17 @@ pipeline {
380
380
docker pull linuxserver/jenkins-builder:latest
381
381
{% endif %}
382
382
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 %}
383
- CURRENTHASH=$(grep -hs ^ " ${TEMPLATED_FILES}" | md5sum | cut -c1-8)
383
+ CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
384
384
cd ${TEMPDIR}/docker-${CONTAINER_NAME}
385
- NEWHASH=$(grep -hs ^ " ${TEMPLATED_FILES}" | md5sum | cut -c1-8)
385
+ NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
386
386
if [[ "${CURRENTHASH}" != "${NEWHASH}" ]]; then
387
387
mkdir -p ${TEMPDIR}/repo
388
388
git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
389
389
git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git checkout -f {{ ls_branch }}
390
390
mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github
391
- cp --parents " ${TEMPLATED_FILES}" ${TEMPDIR}/repo/${LS_REPO}/
391
+ cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/
392
392
cd ${TEMPDIR}/repo/${LS_REPO}/
393
- git add " ${TEMPLATED_FILES}"
393
+ git add ${TEMPLATED_FILES}
394
394
git commit -m 'Bot Updating Templated Files'
395
395
git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
396
396
echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
You can’t perform that action at this time.
0 commit comments