From 1f706af8b8a68c30a6e318c20e4da8e7428cd94a Mon Sep 17 00:00:00 2001 From: thelamer Date: Tue, 18 Dec 2018 17:39:51 -0800 Subject: [PATCH 1/2] adding a chmod command to template genration to ensure build hosts can clear out files --- roles/generate-jenkins/tasks/main.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/roles/generate-jenkins/tasks/main.yml b/roles/generate-jenkins/tasks/main.yml index 537c053a..b192c509 100644 --- a/roles/generate-jenkins/tasks/main.yml +++ b/roles/generate-jenkins/tasks/main.yml @@ -30,3 +30,9 @@ src: ../templates/Jenkinsfile.j2 dest: "/tmp/GENERATED.Jenkinsfile" delegate_to: localhost + +- name: Allow non root host to delete temp files + when: + - lookup('env', 'LOCAL') != "true" + command: chmod -R 777 /ansible/jenkins + delegate_to: localhost From 95d5f4adbf27481a8b0095e7355916c4dbc94682 Mon Sep 17 00:00:00 2001 From: thelamer Date: Tue, 18 Dec 2018 18:04:42 -0800 Subject: [PATCH 2/2] need to chmod the package versions also --- roles/generate-jenkins/templates/Jenkinsfile.j2 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/roles/generate-jenkins/templates/Jenkinsfile.j2 b/roles/generate-jenkins/templates/Jenkinsfile.j2 index 29d02c3c..257cd419 100644 --- a/roles/generate-jenkins/templates/Jenkinsfile.j2 +++ b/roles/generate-jenkins/templates/Jenkinsfile.j2 @@ -476,10 +476,12 @@ pipeline { docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\ apk info > packages && \ apk info -v > versions && \ - paste -d " " packages versions > /tmp/package_versions.txt' + paste -d " " packages versions > /tmp/package_versions.txt && \ + chmod 777 /tmp/package_versions.txt' elif [ "${DIST_IMAGE}" == "ubuntu" ]; then docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\ - apt -qq list --installed | awk "{print \$1,\$2}" > /tmp/package_versions.txt' + apt -qq list --installed | awk "{print \$1,\$2}" > /tmp/package_versions.txt && \ + chmod 777 /tmp/package_versions.txt' fi if [ "$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 )" != "${PACKAGE_TAG}" ]; then git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO}