From 5f28fa26396d2605e032504840ac4391bb85a79e Mon Sep 17 00:00:00 2001 From: Christian Martin <25327135+ct-martin@users.noreply.github.com> Date: Tue, 31 Oct 2017 23:54:30 -0400 Subject: [PATCH 1/3] Update playbook.yml --- build-scripts/playbook.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-scripts/playbook.yml b/build-scripts/playbook.yml index 59b562c..04efb41 100644 --- a/build-scripts/playbook.yml +++ b/build-scripts/playbook.yml @@ -84,5 +84,5 @@ become: true lineinfile: path: /etc/sudoers - line: 'jenkins ALL=NOPASSWD: /var/lib/jenkins/jobs/TigerOS Devel/workspace/tigeros/make-iso.sh' + line: 'jenkins ALL=NOPASSWD: /var/lib/jenkins/jobs/TigerOS-Devel/workspace/tigeros/make-iso.sh' state: present From f488a81a07d06f9411be5362620950e11c3ea9a9 Mon Sep 17 00:00:00 2001 From: Christian Martin <25327135+ct-martin@users.noreply.github.com> Date: Wed, 1 Nov 2017 00:05:06 -0400 Subject: [PATCH 2/3] Add Jenkins job names Can't add in the entire job, but can add in the name for the user. Will continue to investigate full automation of builds --- build-scripts/playbook.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build-scripts/playbook.yml b/build-scripts/playbook.yml index 04efb41..136c543 100644 --- a/build-scripts/playbook.yml +++ b/build-scripts/playbook.yml @@ -86,3 +86,9 @@ path: /etc/sudoers line: 'jenkins ALL=NOPASSWD: /var/lib/jenkins/jobs/TigerOS-Devel/workspace/tigeros/make-iso.sh' state: present + - jenkins_job: + name: TigerOS-Master + state: present + - jenkins_job: + name: TigerOS-Devel + state: present From e240ac918960c363c5dc15b73ee6766b1b8c0db0 Mon Sep 17 00:00:00 2001 From: Christian Martin <25327135+ct-martin@users.noreply.github.com> Date: Wed, 1 Nov 2017 00:07:00 -0400 Subject: [PATCH 3/3] Sudo for Jenkins when building from master --- build-scripts/playbook.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/build-scripts/playbook.yml b/build-scripts/playbook.yml index 136c543..ddee56d 100644 --- a/build-scripts/playbook.yml +++ b/build-scripts/playbook.yml @@ -80,12 +80,18 @@ - name: Update packages command: dnf update become: true - - name: Allow Jenkins sudo access + - name: Allow Jenkins sudo access for devel become: true lineinfile: path: /etc/sudoers line: 'jenkins ALL=NOPASSWD: /var/lib/jenkins/jobs/TigerOS-Devel/workspace/tigeros/make-iso.sh' state: present + - name: Allow Jenkins sudo access for master + become: true + lineinfile: + path: /etc/sudoers + line: 'jenkins ALL=NOPASSWD: /var/lib/jenkins/jobs/TigerOS-Master/workspace/tigeros/make-iso.sh' + state: present - jenkins_job: name: TigerOS-Master state: present