From fc2f3a77d7c8f3355847d9ddad10bb7172d37979 Mon Sep 17 00:00:00 2001 From: jens Date: Thu, 26 Aug 2021 16:22:28 +0000 Subject: [PATCH 01/10] Update 'tasks/main.yml' --- tasks/main.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index fc0a9a1..54211d3 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -22,7 +22,7 @@ force: true become: true become_user : "{{ drone_user }}" - register: gitclone + notify: "Build drone" - name: "Setup systemd service" template: @@ -43,7 +43,6 @@ notify: "Restart drone" args: chdir: "{{ drone_home }}/drone/cmd/drone-server" - when: gitclone.changed # noqa no-handler - name: "Clone runner" get_url: From 617f24e2229fcd2c2fa5d92ffd71402638326054 Mon Sep 17 00:00:00 2001 From: jens Date: Thu, 26 Aug 2021 16:24:01 +0000 Subject: [PATCH 02/10] Update 'meta/main.yml' --- meta/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/main.yml b/meta/main.yml index 764acba..1afe930 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -1,5 +1,5 @@ galaxy_info: - role_name: ansible_role_drone + role_name: jens.drone author: Jens Timmerman description: This role installs drone ci p (https://github.com/drone/drone) From e00fc552c1bd24278c0e9fdcface2e26156b7439 Mon Sep 17 00:00:00 2001 From: jens Date: Thu, 26 Aug 2021 16:24:36 +0000 Subject: [PATCH 03/10] Update 'meta/main.yml' --- meta/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/main.yml b/meta/main.yml index 1afe930..62373e8 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -1,5 +1,5 @@ galaxy_info: - role_name: jens.drone + role_name: drone author: Jens Timmerman description: This role installs drone ci p (https://github.com/drone/drone) From 73aaea212e069956aaafb50c07b6d2851991febf Mon Sep 17 00:00:00 2001 From: jens Date: Thu, 26 Aug 2021 16:26:33 +0000 Subject: [PATCH 04/10] Update 'meta/main.yml' --- meta/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/main.yml b/meta/main.yml index 62373e8..a53eee4 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -1,6 +1,6 @@ galaxy_info: role_name: drone - author: Jens Timmerman + author: jens description: This role installs drone ci p (https://github.com/drone/drone) issue_tracker_url: https://gitea.caret.be/jens/ansible-role-drone/issues From 9ee2f161848e08b82802d990386f544cae49fc73 Mon Sep 17 00:00:00 2001 From: jens Date: Thu, 26 Aug 2021 16:27:39 +0000 Subject: [PATCH 05/10] Update 'tasks/main.yml' --- tasks/main.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index 54211d3..0afec1c 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -36,13 +36,6 @@ - "Restart drone" when: ansible_service_mgr == "systemd" -- name: "Build drone" - command: 'go build' - become: true - become_user : "{{ drone_user }}" - notify: "Restart drone" - args: - chdir: "{{ drone_home }}/drone/cmd/drone-server" - name: "Clone runner" get_url: From 1f4d5dd26e820017863949e69884c71dd426248c Mon Sep 17 00:00:00 2001 From: jens Date: Thu, 26 Aug 2021 16:28:11 +0000 Subject: [PATCH 06/10] Update 'handlers/main.yml' --- handlers/main.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/handlers/main.yml b/handlers/main.yml index 401cbe1..f027d19 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -21,3 +21,12 @@ systemd: daemon_reload: true when: ansible_service_mgr == "systemd" + + +- name: "Build drone" + command: 'go build' + become: true + become_user : "{{ drone_user }}" + notify: "Restart drone" + args: + chdir: "{{ drone_home }}/drone/cmd/drone-server" \ No newline at end of file From a8e612427fc657e3daaf9f8558bf38e1c7f93457 Mon Sep 17 00:00:00 2001 From: jens Date: Thu, 26 Aug 2021 16:32:20 +0000 Subject: [PATCH 07/10] Update 'handlers/main.yml' --- handlers/main.yml | 51 +++++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/handlers/main.yml b/handlers/main.yml index f027d19..f1e95e5 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -1,27 +1,5 @@ --- -- name: "Restart drone" - service: - name: "drone" - state: "restarted" - when: ansible_service_mgr == "systemd" - -- name: "Install drone runner exec" - command: "drone-runner-exec service install" - when: ansible_service_mgr == "systemd" - -- name: "Stop drone runner exec" - command: "drone-runner-exec service stop" - when: ansible_service_mgr == "systemd" - -- name: "Start drone runner exec" - command: "drone-runner-exec service start" - when: ansible_service_mgr == "systemd" - -- name: "Reload systemd" - systemd: - daemon_reload: true - when: ansible_service_mgr == "systemd" - +# handlers are executed in the order they are written in the handlers file, not the order they are notified. - name: "Build drone" command: 'go build' @@ -29,4 +7,29 @@ become_user : "{{ drone_user }}" notify: "Restart drone" args: - chdir: "{{ drone_home }}/drone/cmd/drone-server" \ No newline at end of file + chdir: "{{ drone_home }}/drone/cmd/drone-server" + +- name: "Stop drone runner exec" + command: "drone-runner-exec service stop" + when: ansible_service_mgr == "systemd" + + +- name: "Install drone runner exec" + command: "drone-runner-exec service install" + when: ansible_service_mgr == "systemd" + +- name: "Start drone runner exec" + command: "drone-runner-exec service start" + when: ansible_service_mgr == "systemd" + + +- name: "Reload systemd" + systemd: + daemon_reload: true + when: ansible_service_mgr == "systemd" + +- name: "Restart drone" + service: + name: "drone" + state: "restarted" + when: ansible_service_mgr == "systemd" From a1d0fbe9a50618ec30b9de23c25279941031d433 Mon Sep 17 00:00:00 2001 From: jens Date: Thu, 26 Aug 2021 16:35:36 +0000 Subject: [PATCH 08/10] Update 'tasks/main.yml' --- tasks/main.yml | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index 0afec1c..4ca9af9 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -43,18 +43,9 @@ dest: "{{ drone_home }}" become: true become_user : "{{ drone_user }}" - register: gitclonerunner + notify: "Unzip runner" -- name: "Unzip runner" - unarchive: - src: "{{ drone_home }}/drone_runner_exec_linux_amd64.tar.gz" - remote_src: yes - dest: /usr/local/bin/ - notify: - - "Install drone runner exec" - - "Stop drone runner exec" - - "Start drone runner exec" - + - name: "Make local runner config dir" file: path: "/etc/drone-runner-exec/" From e30022a00bc28380db498a6b9dc84596f764f5b8 Mon Sep 17 00:00:00 2001 From: jens Date: Thu, 26 Aug 2021 16:35:57 +0000 Subject: [PATCH 09/10] Update 'handlers/main.yml' --- handlers/main.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/handlers/main.yml b/handlers/main.yml index f1e95e5..ffaeaf2 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -9,6 +9,17 @@ args: chdir: "{{ drone_home }}/drone/cmd/drone-server" +- name: "Unzip runner" + unarchive: + src: "{{ drone_home }}/drone_runner_exec_linux_amd64.tar.gz" + remote_src: yes + dest: /usr/local/bin/ + notify: + - "Install drone runner exec" + - "Stop drone runner exec" + - "Start drone runner exec" + + - name: "Stop drone runner exec" command: "drone-runner-exec service stop" when: ansible_service_mgr == "systemd" From 851163977ef84184a699521acc43aa609affd17d Mon Sep 17 00:00:00 2001 From: jens Date: Thu, 26 Aug 2021 16:39:08 +0000 Subject: [PATCH 10/10] Update 'handlers/main.yml' --- handlers/main.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/handlers/main.yml b/handlers/main.yml index ffaeaf2..97afa48 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -18,27 +18,26 @@ - "Install drone runner exec" - "Stop drone runner exec" - "Start drone runner exec" - - name: "Stop drone runner exec" command: "drone-runner-exec service stop" when: ansible_service_mgr == "systemd" - - name: "Install drone runner exec" command: "drone-runner-exec service install" when: ansible_service_mgr == "systemd" - -- name: "Start drone runner exec" - command: "drone-runner-exec service start" - when: ansible_service_mgr == "systemd" - + notify: + - "Reload systemd" - name: "Reload systemd" systemd: daemon_reload: true when: ansible_service_mgr == "systemd" +- name: "Start drone runner exec" + command: "drone-runner-exec service start" + when: ansible_service_mgr == "systemd" + - name: "Restart drone" service: name: "drone"