From 7ba2f723178b995e6db4c253f6f21742486d72d1 Mon Sep 17 00:00:00 2001
From: Hayato <falcon.int50m@gmail.com>
Date: Sun, 12 Jan 2025 05:11:53 +0900
Subject: [PATCH] Fix everytime runner installing

---
 inventories/host_vars/runner.yml |  1 +
 runner03.yml                     |  5 ++---
 tasks/runner/install_runners.yml | 16 ++++++++++++----
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/inventories/host_vars/runner.yml b/inventories/host_vars/runner.yml
index 33ffbde..a54605c 100644
--- a/inventories/host_vars/runner.yml
+++ b/inventories/host_vars/runner.yml
@@ -57,6 +57,7 @@ runner:
           39643236383637633663373138663961393937633764316161313337306265363662333935616436
           3561323139373365326132353130626633363234666334303963
   runners:
+    basepath: "/opt/runner"
     nuc03:
       - runner_name: ansible_hayaworld_03-01
         github_repo: ansible_hayaworld
diff --git a/runner03.yml b/runner03.yml
index 8c4def8..dc6564d 100644
--- a/runner03.yml
+++ b/runner03.yml
@@ -69,9 +69,8 @@
         - sudo
 
     - name: Install Runners
-      ansible.builtin.import_tasks:
+      ansible.builtin.include_tasks:
         file: tasks/runner/install_runners.yml
-      vars:
-        runners_define: "{{ runner.runners.nuc03 }}"
+      loop: "{{ runner.runners.nuc03 }}"
       tags:
         - runners
diff --git a/tasks/runner/install_runners.yml b/tasks/runner/install_runners.yml
index c14ee52..eb269e4 100644
--- a/tasks/runner/install_runners.yml
+++ b/tasks/runner/install_runners.yml
@@ -1,14 +1,21 @@
 ---
+- name: "Check svc.sh exists for {{ item.runner_name }}"
+  ansible.builtin.stat:
+    path: "{{ runner.runners.basepath }}/{{ item.runner_name }}/svc.sh"
+  register: "is_configured"
+  tags:
+    - always
+
 # https://github.com/MonolithProjects/ansible-github_actions_runner
 - name: Install Runners
-  ansible.builtin.include_role:
+  ansible.builtin.import_role:
     name: monolithprojects.github_actions_runner
   vars:
     runner_user: "{{ runner.user.username }}"
-    runner_dir: "/opt/runner/{{ item.runner_name }}"
+    runner_dir: "{{ runner.runners.basepath }}/{{ item.runner_name }}"
     runner_version: "2.321.0"
     runner_state: "started"
-    reinstall_runner: true
+    reinstall_runner: "{{ not (is_configured.stat.exists) }}"
     hide_sensitive_logs: true
     github_url: "https://github.com"
     github_api_url: "https://api.github.com"
@@ -20,4 +27,5 @@
     all_runners_in_same_repo: false
     github_account: "cradle8810"
     github_repo: "{{ item.github_repo }}"
-  loop: "{{ runners_define }}"
+  tags:
+    - always