From b26ef9d7ea7c7944f7d20ae8b672f2b2721dfb05 Mon Sep 17 00:00:00 2001 From: Michele Capra Date: Sun, 5 Feb 2017 18:45:49 +0100 Subject: [PATCH 1/8] remved extra warning not necessay anymore --- setup/windows/README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/setup/windows/README.md b/setup/windows/README.md index 3910b9462..f885b2091 100644 --- a/setup/windows/README.md +++ b/setup/windows/README.md @@ -42,16 +42,12 @@ To test the connection to the hosts, run: $ ansible node-windows -i ../ansible-inventory -m win_ping -vvvv ``` -Make sure Windows Update has been run and the machines are updated with no reboot pending. To run the Ansible playbook to setup the machines run: ```text $ ansible-playbook -i ../ansible-inventory ansible-playbook.yaml -vv ``` -Note: Visual Studio installation can fail if it must reboot during install. -In this case, install Visual Studio manually and re-run Ansible. - The servers should logon automatically at boot and start the Jenkins slave, but there is no automatic restart procedure for crashes (for now). Hence, to start Jenkins after running `ansible-playbook`, the server must be restarted or the slave must be manually started with RDP. From 818137130a87d752da97cafb8b6de76bf4c5a6d9 Mon Sep 17 00:00:00 2001 From: Michele Capra Date: Fri, 7 Jul 2017 20:49:23 +0200 Subject: [PATCH 2/8] added test dir for ubuntu 16 --- ansible/roles/bootstrap/tasks/partials/ubuntu1604.yml | 3 +++ ansible/roles/bootstrap/tasks/partials/ubuntu1610.yml | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/ansible/roles/bootstrap/tasks/partials/ubuntu1604.yml b/ansible/roles/bootstrap/tasks/partials/ubuntu1604.yml index c74070bae..b6a9514ba 100644 --- a/ansible/roles/bootstrap/tasks/partials/ubuntu1604.yml +++ b/ansible/roles/bootstrap/tasks/partials/ubuntu1604.yml @@ -17,3 +17,6 @@ - name: install python and aptitude when: has_python.rc == 1 or has_aptitude.rc == 1 raw: apt install -y python-minimal aptitude + +- name: Creates NODE_TEST_DIR directory + file: path=/home/{{ server_user }}/tmp state=directory diff --git a/ansible/roles/bootstrap/tasks/partials/ubuntu1610.yml b/ansible/roles/bootstrap/tasks/partials/ubuntu1610.yml index e25c52b40..888b40708 100644 --- a/ansible/roles/bootstrap/tasks/partials/ubuntu1610.yml +++ b/ansible/roles/bootstrap/tasks/partials/ubuntu1610.yml @@ -17,3 +17,7 @@ - name: install python and aptitude when: has_python.rc == 1 or has_aptitude.rc == 1 raw: apt install -y python-minimal aptitude + +- name: Creates NODE_TEST_DIR directory + file: path=/home/{{ server_user }}/tmp state=directory + \ No newline at end of file From b067155b87336fc07307ba9ccddd8f3f177dd144 Mon Sep 17 00:00:00 2001 From: Michele Capra Date: Fri, 7 Jul 2017 20:56:09 +0200 Subject: [PATCH 3/8] refactoring --- ansible/roles/bootstrap/tasks/partials/ubuntu1604.yml | 4 ++-- ansible/roles/bootstrap/tasks/partials/ubuntu1610.yml | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ansible/roles/bootstrap/tasks/partials/ubuntu1604.yml b/ansible/roles/bootstrap/tasks/partials/ubuntu1604.yml index b6a9514ba..e9a670b17 100644 --- a/ansible/roles/bootstrap/tasks/partials/ubuntu1604.yml +++ b/ansible/roles/bootstrap/tasks/partials/ubuntu1604.yml @@ -18,5 +18,5 @@ when: has_python.rc == 1 or has_aptitude.rc == 1 raw: apt install -y python-minimal aptitude -- name: Creates NODE_TEST_DIR directory - file: path=/home/{{ server_user }}/tmp state=directory +- name: create NODE_TEST_DIR directory + file: path=/home/{{ server_user }}/tmp state=directory \ No newline at end of file diff --git a/ansible/roles/bootstrap/tasks/partials/ubuntu1610.yml b/ansible/roles/bootstrap/tasks/partials/ubuntu1610.yml index 888b40708..826ac3642 100644 --- a/ansible/roles/bootstrap/tasks/partials/ubuntu1610.yml +++ b/ansible/roles/bootstrap/tasks/partials/ubuntu1610.yml @@ -18,6 +18,5 @@ when: has_python.rc == 1 or has_aptitude.rc == 1 raw: apt install -y python-minimal aptitude -- name: Creates NODE_TEST_DIR directory - file: path=/home/{{ server_user }}/tmp state=directory - \ No newline at end of file +- name: create NODE_TEST_DIR directory + file: path=/home/{{ server_user }}/tmp state=directory \ No newline at end of file From 76ea8361d3b56165d3b60f23010498370f6dcfaf Mon Sep 17 00:00:00 2001 From: Michele Capra Date: Sun, 23 Jul 2017 18:17:02 +0200 Subject: [PATCH 4/8] moved script into main.yml --- ansible/roles/bootstrap/tasks/partials/ubuntu1604.yml | 5 +---- ansible/roles/bootstrap/tasks/partials/ubuntu1610.yml | 5 +---- ansible/roles/jenkins-worker/tasks/main.yml | 3 +++ 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/ansible/roles/bootstrap/tasks/partials/ubuntu1604.yml b/ansible/roles/bootstrap/tasks/partials/ubuntu1604.yml index e9a670b17..680333a55 100644 --- a/ansible/roles/bootstrap/tasks/partials/ubuntu1604.yml +++ b/ansible/roles/bootstrap/tasks/partials/ubuntu1604.yml @@ -16,7 +16,4 @@ - name: install python and aptitude when: has_python.rc == 1 or has_aptitude.rc == 1 - raw: apt install -y python-minimal aptitude - -- name: create NODE_TEST_DIR directory - file: path=/home/{{ server_user }}/tmp state=directory \ No newline at end of file + raw: apt install -y python-minimal aptitude \ No newline at end of file diff --git a/ansible/roles/bootstrap/tasks/partials/ubuntu1610.yml b/ansible/roles/bootstrap/tasks/partials/ubuntu1610.yml index 826ac3642..7b3b35bb9 100644 --- a/ansible/roles/bootstrap/tasks/partials/ubuntu1610.yml +++ b/ansible/roles/bootstrap/tasks/partials/ubuntu1610.yml @@ -16,7 +16,4 @@ - name: install python and aptitude when: has_python.rc == 1 or has_aptitude.rc == 1 - raw: apt install -y python-minimal aptitude - -- name: create NODE_TEST_DIR directory - file: path=/home/{{ server_user }}/tmp state=directory \ No newline at end of file + raw: apt install -y python-minimal aptitude \ No newline at end of file diff --git a/ansible/roles/jenkins-worker/tasks/main.yml b/ansible/roles/jenkins-worker/tasks/main.yml index 0aa1bf865..eb49835f0 100644 --- a/ansible/roles/jenkins-worker/tasks/main.yml +++ b/ansible/roles/jenkins-worker/tasks/main.yml @@ -19,6 +19,9 @@ state: present line: ::1 localhost.localdomain localhost +- name: create NODE_TEST_DIR directory + file: path=/home/{{ server_user }}/tmp state=directory + - name: prepare installing tap2junit when: type != "release" include: "{{ pip_include }}" From cd7d7fb0dc87e886e326876f54121c00677074ee Mon Sep 17 00:00:00 2001 From: Michele Capra Date: Sun, 23 Jul 2017 20:29:14 +0200 Subject: [PATCH 5/8] readded new line --- ansible/roles/bootstrap/tasks/partials/ubuntu1604.yml | 3 ++- ansible/roles/bootstrap/tasks/partials/ubuntu1610.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ansible/roles/bootstrap/tasks/partials/ubuntu1604.yml b/ansible/roles/bootstrap/tasks/partials/ubuntu1604.yml index 680333a55..688052b35 100644 --- a/ansible/roles/bootstrap/tasks/partials/ubuntu1604.yml +++ b/ansible/roles/bootstrap/tasks/partials/ubuntu1604.yml @@ -16,4 +16,5 @@ - name: install python and aptitude when: has_python.rc == 1 or has_aptitude.rc == 1 - raw: apt install -y python-minimal aptitude \ No newline at end of file + raw: apt install -y python-minimal aptitude + \ No newline at end of file diff --git a/ansible/roles/bootstrap/tasks/partials/ubuntu1610.yml b/ansible/roles/bootstrap/tasks/partials/ubuntu1610.yml index 7b3b35bb9..661208c75 100644 --- a/ansible/roles/bootstrap/tasks/partials/ubuntu1610.yml +++ b/ansible/roles/bootstrap/tasks/partials/ubuntu1610.yml @@ -16,4 +16,5 @@ - name: install python and aptitude when: has_python.rc == 1 or has_aptitude.rc == 1 - raw: apt install -y python-minimal aptitude \ No newline at end of file + raw: apt install -y python-minimal aptitude + \ No newline at end of file From 25fd37a4a14062a2f34cc94bd9e0ededb43d3785 Mon Sep 17 00:00:00 2001 From: Michele Capra Date: Sun, 23 Jul 2017 20:30:06 +0200 Subject: [PATCH 6/8] removed spaces --- ansible/roles/bootstrap/tasks/partials/ubuntu1604.yml | 1 - ansible/roles/bootstrap/tasks/partials/ubuntu1610.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/ansible/roles/bootstrap/tasks/partials/ubuntu1604.yml b/ansible/roles/bootstrap/tasks/partials/ubuntu1604.yml index 688052b35..c74070bae 100644 --- a/ansible/roles/bootstrap/tasks/partials/ubuntu1604.yml +++ b/ansible/roles/bootstrap/tasks/partials/ubuntu1604.yml @@ -17,4 +17,3 @@ - name: install python and aptitude when: has_python.rc == 1 or has_aptitude.rc == 1 raw: apt install -y python-minimal aptitude - \ No newline at end of file diff --git a/ansible/roles/bootstrap/tasks/partials/ubuntu1610.yml b/ansible/roles/bootstrap/tasks/partials/ubuntu1610.yml index 661208c75..e25c52b40 100644 --- a/ansible/roles/bootstrap/tasks/partials/ubuntu1610.yml +++ b/ansible/roles/bootstrap/tasks/partials/ubuntu1610.yml @@ -17,4 +17,3 @@ - name: install python and aptitude when: has_python.rc == 1 or has_aptitude.rc == 1 raw: apt install -y python-minimal aptitude - \ No newline at end of file From bee58e7a4cd4440a477aa6ecdcbe32323b779e50 Mon Sep 17 00:00:00 2001 From: Michele Capra Date: Mon, 24 Jul 2017 21:04:28 +0200 Subject: [PATCH 7/8] added set permission step --- ansible/roles/jenkins-worker/tasks/main.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ansible/roles/jenkins-worker/tasks/main.yml b/ansible/roles/jenkins-worker/tasks/main.yml index eb49835f0..0ef38ea32 100644 --- a/ansible/roles/jenkins-worker/tasks/main.yml +++ b/ansible/roles/jenkins-worker/tasks/main.yml @@ -22,6 +22,13 @@ - name: create NODE_TEST_DIR directory file: path=/home/{{ server_user }}/tmp state=directory +- name: set NODE_TEST_DIR permission and owner + file: + path: /home/{{ server_user }}/tmp + owner: "{{ server_user }}" + group: "{{ server_user }}" + mode: 0655 + - name: prepare installing tap2junit when: type != "release" include: "{{ pip_include }}" From 7a7e95beeb4811938597efc325f518d9c31ad0cf Mon Sep 17 00:00:00 2001 From: Michele Capra Date: Tue, 25 Jul 2017 08:27:06 +0200 Subject: [PATCH 8/8] changed permission --- ansible/roles/jenkins-worker/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/jenkins-worker/tasks/main.yml b/ansible/roles/jenkins-worker/tasks/main.yml index 0ef38ea32..e2785c69d 100644 --- a/ansible/roles/jenkins-worker/tasks/main.yml +++ b/ansible/roles/jenkins-worker/tasks/main.yml @@ -27,7 +27,7 @@ path: /home/{{ server_user }}/tmp owner: "{{ server_user }}" group: "{{ server_user }}" - mode: 0655 + mode: 0755 - name: prepare installing tap2junit when: type != "release"