From 9378451a1204eb15d1f2b322b92c0439f4e4ada2 Mon Sep 17 00:00:00 2001 From: Emil Simeonov Date: Thu, 18 Jun 2026 04:40:11 +0200 Subject: [PATCH] GRM-12: fix: remove recursive var definitions from install-runner.yml --- ansible/install-runner.yml | 4 ---- .../roles/gitea-runner/tasks/integration_test.yml | 14 ++++++++------ 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/ansible/install-runner.yml b/ansible/install-runner.yml index 1c72766..bc747ea 100644 --- a/ansible/install-runner.yml +++ b/ansible/install-runner.yml @@ -2,9 +2,5 @@ - name: Install Gitea Actions runner hosts: all become: true - vars: - gitea_url: "{{ gitea_url | mandatory }}" - registration_token: "{{ registration_token | mandatory }}" - gitea_admin_token: "{{ gitea_admin_token | default('') }}" roles: - role: gitea-runner diff --git a/ansible/roles/gitea-runner/tasks/integration_test.yml b/ansible/roles/gitea-runner/tasks/integration_test.yml index 185f0f3..b6c3ed8 100644 --- a/ansible/roles/gitea-runner/tasks/integration_test.yml +++ b/ansible/roles/gitea-runner/tasks/integration_test.yml @@ -9,13 +9,15 @@ return_content: false register: api_check ignore_errors: true - when: gitea_url is defined and (gitea_admin_token is defined or registration_token is defined) + when: + - gitea_url is defined + - gitea_admin_token is defined - name: Wait for runner to appear in Gitea API ansible.builtin.uri: url: "{{ gitea_url }}/api/v1/admin/runners" headers: - Authorization: "token {{ gitea_admin_token | default(registration_token) }}" + Authorization: "token {{ gitea_admin_token }}" method: GET status_code: 200 return_content: true @@ -28,14 +30,14 @@ delay: 10 when: - gitea_url is defined - - (gitea_admin_token is defined or registration_token is defined) + - gitea_admin_token is defined - api_check.status | default(0) == 200 - name: Verify runner is online ansible.builtin.uri: url: "{{ gitea_url }}/api/v1/admin/runners" headers: - Authorization: "token {{ gitea_admin_token | default(registration_token) }}" + Authorization: "token {{ gitea_admin_token }}" method: GET status_code: 200 return_content: true @@ -43,7 +45,7 @@ register: runners_check when: - gitea_url is defined - - (gitea_admin_token is defined or registration_token is defined) + - gitea_admin_token is defined - api_check.status | default(0) == 200 - name: Fail if runner is not online @@ -51,7 +53,7 @@ msg: "Runner '{{ runner_name }}' is not online in Gitea" when: - gitea_url is defined - - (gitea_admin_token is defined or registration_token is defined) + - gitea_admin_token is defined - api_check.status | default(0) == 200 - > runners_check.json.runners | default([]) |