From cdc58aa46ca20f0b68a5ae1b221a720ac30722af Mon Sep 17 00:00:00 2001 From: Tobias Huste Date: Thu, 16 Jan 2025 08:39:24 +0100 Subject: [PATCH 1/2] Fix autoscaler URL template and install 0.28.0 by default --- roles/gitlab_runner/defaults/main.yml | 7 ++++--- roles/gitlab_runner/tasks/install.autoscaler-plugin.yml | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/roles/gitlab_runner/defaults/main.yml b/roles/gitlab_runner/defaults/main.yml index d1e3821..356a6e6 100644 --- a/roles/gitlab_runner/defaults/main.yml +++ b/roles/gitlab_runner/defaults/main.yml @@ -46,8 +46,9 @@ gitlab_runner_session_server_listen_address: "0.0.0.0:8093" gitlab_runner_session_server_advertise_address: "{{ gitlab_runner_session_server_listen_address }}" gitlab_runner_session_server_timeout: 1800 -gitlab_runner_autoscaler_plugin_version: "0.21.1" -gitlab_runner_autoscaler_plugin_url: "https://github.com/sardinasystems/fleeting-plugin-openstack/releases/download/{{ gitlab_runner_autoscaler_plugin_version }}/fleeting-plugin-openstack_{{ gitlab_runner_autoscaler_plugin_version }}_linux_amd64.tar.gz" -gitlab_runner_autoscaler_plugin_checksumfile: "https://github.com/sardinasystems/fleeting-plugin-openstack/releases/download/{{ gitlab_runner_autoscaler_plugin_version }}/fleeting-plugin-openstack_{{ gitlab_runner_autoscaler_plugin_version }}_sha512-checksums.txt" +gitlab_runner_autoscaler_plugin_version: "v0.28.0" +gitlab_runner_autoscaler_binary_version: "{{ gitlab_runner_autoscaler_plugin_version | replace('v', '') }}" +gitlab_runner_autoscaler_plugin_url: "https://github.com/sardinasystems/fleeting-plugin-openstack/releases/download/{{ gitlab_runner_autoscaler_plugin_version }}/fleeting-plugin-openstack_{{ gitlab_runner_autoscaler_binary_version }}_linux_amd64.tar.gz" +gitlab_runner_autoscaler_plugin_checksumfile: "https://github.com/sardinasystems/fleeting-plugin-openstack/releases/download/{{ gitlab_runner_autoscaler_plugin_version }}/fleeting-plugin-openstack_{{ gitlab_runner_autoscaler_binary_version }}_sha512-checksums.txt" gitlab_runner_butane_config_template: "butane-config.bu.j2" diff --git a/roles/gitlab_runner/tasks/install.autoscaler-plugin.yml b/roles/gitlab_runner/tasks/install.autoscaler-plugin.yml index 16a51fa..bb107d8 100644 --- a/roles/gitlab_runner/tasks/install.autoscaler-plugin.yml +++ b/roles/gitlab_runner/tasks/install.autoscaler-plugin.yml @@ -21,7 +21,7 @@ check_mode: false - name: "Download and install fleeting plugin" - when: "not _fleeting_plugin_openstack_stat.stat.exists or _fleeting_plugin_version_installed.stdout != gitlab_runner_autoscaler_plugin_version" + when: "not _fleeting_plugin_openstack_stat.stat.exists or _fleeting_plugin_version_installed.stdout != gitlab_runner_autoscaler_binary_version" block: - name: "Create temporary directory" ansible.builtin.tempfile: From 4a99c165d3d136ed4ca104ada23d46a0ef6ce9c4 Mon Sep 17 00:00:00 2001 From: Tobias Huste Date: Thu, 16 Jan 2025 09:17:08 +0100 Subject: [PATCH 2/2] Match ansible-lint exclude paths with ansible-compat See https://github.com/ansible/ansible-lint/issues/4477 --- .ansible-lint | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.ansible-lint b/.ansible-lint index abf401d..7cea43e 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -3,5 +3,8 @@ # # SPDX-License-Identifier: Apache-2.0 +exclude_paths: + - ".cache/" + - ".ansible/" skip_list: - 'var-naming[no-role-prefix]'