Skip to content

Commit 9dcad54

Browse files
authored
Merge pull request #380 from Normo/fix-runner-installation
Ensure gitlab-runner and helper-images have the same version
2 parents 6e4323c + 510f46d commit 9dcad54

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

roles/gitlab_runner/tasks/install.debianlike.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,16 @@
3939
mode: '0644'
4040
when: "ansible_distribution == 'Debian'"
4141

42+
- name: "Install gitlab-runner-helper-images with downgrade option"
43+
ansible.builtin.apt:
44+
name: "{{ gitlab_runner_helper_images_package_name }}"
45+
state: "present"
46+
update_cache: true
47+
allow_downgrade: true
48+
when:
49+
- "not gitlab_runner_is_initial_dryrun" # skip if run for the first time in check mode
50+
- "gitlab_runner_version is version('17.7.0', 'ge') or gitlab_runner_version | length == 0"
51+
4252
- name: "Install gitlab-runner with downgrade option"
4353
ansible.builtin.apt:
4454
name: "{{ gitlab_runner_package_name }}"

roles/gitlab_runner/vars/debian.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
# SPDX-License-Identifier: Apache-2.0
55

66
---
7-
gitlab_runner_package_name: "{{ 'gitlab-runner=' + gitlab_runner_pkg_version if gitlab_runner_version else 'gitlab-runner' }}"
7+
gitlab_runner_package_name: "gitlab-runner{{ '=' + gitlab_runner_pkg_version if gitlab_runner_version else '' }}"
8+
gitlab_runner_helper_images_package_name: "gitlab-runner-helper-images{{ '=' + gitlab_runner_pkg_version if gitlab_runner_version else '' }}"

0 commit comments

Comments
 (0)