From 6ec2d299fc179862a416349eb3157d2c0730d282 Mon Sep 17 00:00:00 2001 From: Gabriel Radureau Date: Wed, 27 Aug 2025 18:11:14 +0200 Subject: [PATCH] fix gitea action registration --- .../group_vars/gitea/gitea_vault.yml | 26 +++++++++---------- .../arcodange/factory/playbooks/03_cicd.yml | 6 ++--- .../roles/gitea_token/defaults/main.yml | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ansible/arcodange/factory/inventory/group_vars/gitea/gitea_vault.yml b/ansible/arcodange/factory/inventory/group_vars/gitea/gitea_vault.yml index 7316031..8b39ee9 100644 --- a/ansible/arcodange/factory/inventory/group_vars/gitea/gitea_vault.yml +++ b/ansible/arcodange/factory/inventory/group_vars/gitea/gitea_vault.yml @@ -1,14 +1,14 @@ $ANSIBLE_VAULT;1.1;AES256 -36376264363339363633323934646662623836323237373638326331643333383664393363653133 -6136336438613839376466613530303630613035383935660a383934386234633163343735633435 -65623262633238356338343038333765333064323337653638636138626530643661313832643634 -3365363638616231350a303461336564636633333664643566346432653032336233326338376134 -36386235366564306533643635653232373634346333373236313462393533396334623365326638 -33363934663763326534363562643338333361616633323336313862353838666235393063306535 -33303465356166323630306265303930363066386533653966633162633161623266356664636537 -32653964326466336136376365386439313962316666333935663037326434306430343734646664 -62376137306434313235363334373737636564316465323965613030643135336161316331663332 -34646437336262306533303462623936336561633032643437396335356435333861353934643234 -63376362366563316437383062653930373536666330313261396338656532333034373232386331 -37363463633863333433613463336564636336366633353663336162303563646331373635663437 -30393962613939323161306131313630333438653539363439643131373736313132 +32306161663530376161333835626633326334356137363366643838346132613666356566383638 +3263386238353438376432313332393134333339306336640a366130313661316166383436346364 +39613364326533376530623636636334316532343330376366333338626130333533343937623165 +6538333530376132350a383934336566623866366338323034613965623237653564366435666464 +33303064356161316564396439383533333139653632393332663336356430383866643337363766 +30646663663737336162383663383664633030653039313565626164313134326433653965306262 +39393361643639333166623631316465316564393639643764336133306663346261303137376333 +30333930613062383465613139646562383836633431366637616166666131366232623065396238 +35313334633064313234383537663632356466326133333238636335383666323839393930633565 +36663130343035383731303332396436333333353863376461376131393834666232336138323666 +38346566616137323830346433303535343030623364353364653731353233373337363633626638 +32613661633962643030333662386333323035656265316537633961373537373961303134353936 +33633632633835666364663964383661383830336631333531623131633763333733 diff --git a/ansible/arcodange/factory/playbooks/03_cicd.yml b/ansible/arcodange/factory/playbooks/03_cicd.yml index 7faa751..2e89df7 100644 --- a/ansible/arcodange/factory/playbooks/03_cicd.yml +++ b/ansible/arcodange/factory/playbooks/03_cicd.yml @@ -10,7 +10,7 @@ - name: Fetch Gitea Token for Action Runner registration delegate_to: "{{ groups.gitea[0] }}" - delegate_facts: true + delegate_facts: false ansible.builtin.command: docker exec gitea su git -c "gitea actions generate-runner-token" register: gitea_runner_token_cmd @@ -30,7 +30,7 @@ GITEA_INSTANCE_URL: >- http://{{ hostvars[groups.gitea[0]].ansible_host }}:3000 GITEA_RUNNER_REGISTRATION_TOKEN: "{{ gitea_runner_token_cmd.stdout }}" - GITEA_RUNNER_NAME: arcodange_global_runner + GITEA_RUNNER_NAME: arcodange_global_runner_{{ inventory_hostname }} # GITEA_RUNNER_LABELS: host={{ansible_host}},env=any volumes: - /var/run/docker.sock:/var/run/docker.sock @@ -54,7 +54,7 @@ # Where to store the registration result. file: .runner # Execute how many tasks concurrently at the same time. - capacity: 1 + capacity: 2 # Extra environment variables to run jobs. envs: A_TEST_ENV_NAME_1: a_test_env_value_1 diff --git a/ansible/arcodange/factory/roles/gitea_token/defaults/main.yml b/ansible/arcodange/factory/roles/gitea_token/defaults/main.yml index 7630d99..8b81232 100644 --- a/ansible/arcodange/factory/roles/gitea_token/defaults/main.yml +++ b/ansible/arcodange/factory/roles/gitea_token/defaults/main.yml @@ -4,5 +4,5 @@ gitea_token_scopes: write:admin,write:organization,write:package,write:repositor gitea_token_fact_name: gitea_api_token gitea_base_url: 'http://{{ groups.gitea[0] }}:3000' gitea_token_replace: false -gitea_token_name: ansible-{{ ansible_date_time.iso8601 }} # require gathering facts +gitea_token_name: ansible-{{ ansible_date_time.iso8601 }}-{{ inventory_hostname }} # require gathering facts gitea_token_delete: false # only delete token \ No newline at end of file