From cfce442d87b483532687d72759937ddb5e8b2c56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mehmet=20K=C3=B6se?= Date: Thu, 26 Aug 2021 14:54:53 +0200 Subject: [PATCH 1/6] fix spaces before and after var --- tasks/main.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index 93fe46e..99c7f4a 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -49,7 +49,7 @@ git: dest: "{{ drone_home }}/drone" repo: https://github.com/drone-runners/drone-runner-exec.git - version: "{{ v1.0.0-beta.9}}" + version: "{{ v1.0.0-beta.9 }}" become: true become_user : "{{ drone_user }}" register: gitclonerunner @@ -90,7 +90,6 @@ command: 'drone-runner-exec service start' when: gitclonerunner.changed - - name: "Configure drone" template: src: "rundrone.sh.j2" From 40a20f1d3b8a141e4a74d947642d79b546cc9dad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mehmet=20K=C3=B6se?= Date: Thu, 26 Aug 2021 15:28:54 +0200 Subject: [PATCH 2/6] fix linting --- handlers/main.yml | 8 ++++++- tasks/main.yml | 54 ++++++++++++++++++++++++++--------------------- 2 files changed, 37 insertions(+), 25 deletions(-) diff --git a/handlers/main.yml b/handlers/main.yml index 2da19c3..4efc0b3 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -1,11 +1,17 @@ --- -# handlers file for im - 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: "Start drone runner exec" + command: "drone-runner-exec service start" + when: ansible_service_mgr == "systemd" - name: "Reload systemd" systemd: diff --git a/tasks/main.yml b/tasks/main.yml index 99c7f4a..0dc7bbd 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,6 +1,6 @@ --- # tasks file for drone -- name: 'install dependencies' +- name: 'Install dependencies' package: name: - 'git' @@ -14,7 +14,7 @@ home: "{{ drone_home }}" shell: "/bin/false" -- name: 'download latest drone' +- name: 'Download latest drone' git: dest: "{{ drone_home }}/drone" repo: https://github.com/drone/drone.git @@ -36,59 +36,65 @@ - "Restart drone" when: ansible_service_mgr == "systemd" -- name: "build drone" +- name: "Build drone" command: 'go build' become: true become_user : "{{ drone_user }}" notify: "Restart drone" args: chdir: "{{ drone_home }}/drone/cmd/drone-server" - when: gitclone.changed + when: gitclone.changed # noqa no-handler -- name: "clone runner" - git: - dest: "{{ drone_home }}/drone" - repo: https://github.com/drone-runners/drone-runner-exec.git - version: "{{ v1.0.0-beta.9 }}" +- name: "Clone runner" + get_url: + url: https://github.com/drone-runners/drone-runner-exec/releases/latest/download/drone_runner_exec_linux_amd64.tar.gz + dest: "{{ drone_home }}" become: true become_user : "{{ drone_user }}" register: gitclonerunner -- name: "make local runner config dir" +- name: "Unzip runner" + unarchive: + src: "{{ drone_home }}/{{ item }}" + dest: /usr/local/bin/ + with_items: + - "{{ gitclonerunner.stdout }}" + notify: + - "Install drone runner exec" + - "Start drone runner exec" + +- name: "Make local runner config dir" file: path: "/etc/drone-runner-exec/" state: directory owner: drone group: drone mode: '0700' + notify: + - "Install drone runner exec" + - "Start drone runner exec" -- name: "make local runner config dir" +- name: "Make local runner config dir" file: path: "/var/log/drone-runner-exec/" state: directory owner: drone group: drone mode: '0700' + notify: + - "Install drone runner exec" + - "Start drone runner exec" -- name: "configure local runner" +- name: "Configure local runner" template: src: exec_runner_config.j2 dest: "/etc/drone-runner-exec/config" owner: drone group: drone mode: '0700' - -- name: "install local runner" - command: 'cp drone-runner-exec/drone-runner-exec /usr/loca/bin/drone-runner-exec && drone-runner-exec service install' - when: gitclonerunner.changed - -- name: "stop local runner" - command: 'drone-runner-exec service stop' - when: gitclonerunner.changed - -- name: "start local runner" - command: 'drone-runner-exec service start' - when: gitclonerunner.changed + notify: + - "Install drone runner exec" + - "Start drone runner exec" - name: "Configure drone" template: From 5a76441b18d502247ab7bec4d146fb942c145fe1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mehmet=20K=C3=B6se?= Date: Thu, 26 Aug 2021 15:33:47 +0200 Subject: [PATCH 3/6] install start stop --- handlers/main.yml | 4 ++++ tasks/main.yml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/handlers/main.yml b/handlers/main.yml index 4efc0b3..401cbe1 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -9,6 +9,10 @@ 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" diff --git a/tasks/main.yml b/tasks/main.yml index 0dc7bbd..6fdc6db 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -61,6 +61,7 @@ - "{{ gitclonerunner.stdout }}" notify: - "Install drone runner exec" + - "Stop drone runner exec" - "Start drone runner exec" - name: "Make local runner config dir" @@ -72,6 +73,7 @@ mode: '0700' notify: - "Install drone runner exec" + - "Stop drone runner exec" - "Start drone runner exec" - name: "Make local runner config dir" @@ -83,6 +85,7 @@ mode: '0700' notify: - "Install drone runner exec" + - "Stop drone runner exec" - "Start drone runner exec" - name: "Configure local runner" @@ -94,6 +97,7 @@ mode: '0700' notify: - "Install drone runner exec" + - "Stop drone runner exec" - "Start drone runner exec" - name: "Configure drone" From 18ce708d681383a14c61544f290c104de4400f37 Mon Sep 17 00:00:00 2001 From: jens Date: Thu, 26 Aug 2021 15:50:25 +0000 Subject: [PATCH 4/6] Update 'tasks/main.yml' --- tasks/main.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index 6fdc6db..29f1c2e 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -55,10 +55,8 @@ - name: "Unzip runner" unarchive: - src: "{{ drone_home }}/{{ item }}" + src: "{{ drone_home }}/drone_runner_exec_linux_amd64.tar.gz" dest: /usr/local/bin/ - with_items: - - "{{ gitclonerunner.stdout }}" notify: - "Install drone runner exec" - "Stop drone runner exec" From 0b903820b38d6278510fafb3fee79d8de3de383f Mon Sep 17 00:00:00 2001 From: jens Date: Thu, 26 Aug 2021 15:54:11 +0000 Subject: [PATCH 5/6] Update 'tasks/main.yml' --- tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/main.yml b/tasks/main.yml index 29f1c2e..71f2652 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -55,7 +55,7 @@ - name: "Unzip runner" unarchive: - src: "{{ drone_home }}/drone_runner_exec_linux_amd64.tar.gz" + remote_src: "{{ drone_home }}/drone_runner_exec_linux_amd64.tar.gz" dest: /usr/local/bin/ notify: - "Install drone runner exec" From a97e3d546ba12b0a0118f9868b24317d37e8e292 Mon Sep 17 00:00:00 2001 From: jens Date: Thu, 26 Aug 2021 15:56:10 +0000 Subject: [PATCH 6/6] Update 'tasks/main.yml' --- tasks/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tasks/main.yml b/tasks/main.yml index 71f2652..fc0a9a1 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -55,7 +55,8 @@ - name: "Unzip runner" unarchive: - remote_src: "{{ drone_home }}/drone_runner_exec_linux_amd64.tar.gz" + src: "{{ drone_home }}/drone_runner_exec_linux_amd64.tar.gz" + remote_src: yes dest: /usr/local/bin/ notify: - "Install drone runner exec"