Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: install gitlab-runner-helper-packages if version is specified #363

Merged
merged 2 commits into from
Feb 4, 2025
Merged

fix: install gitlab-runner-helper-packages if version is specified #363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4378b6
feat: remove obsolete install task for buster
nicoklaus Feb 4, 2025
a08da17
feat: add install tasks for gitlab-runner-helper-images
nicoklaus Feb 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
# for versions >= 10.x
gitlab_runner_package_name: gitlab-runner
gitlab_runner_helper_package_name: gitlab-runner-helper-images

gitlab_runner_system_mode: true

Expand Down
26 changes: 19 additions & 7 deletions tasks/install-debian.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@
become: true
when: gitlab_runner_skip_package_repo_install is not defined or not gitlab_runner_skip_package_repo_install

- name: (Debian) Update gitlab_runner_package_name
- name: (Debian) Update gitlab_runner_package_name and gitlab_runner_helper_package_name
ansible.builtin.set_fact:
gitlab_runner_package: "{{ gitlab_runner_package_name }}={{ gitlab_runner_package_version }}"
gitlab_runner_helper_package: "{{ gitlab_runner_helper_package_name }}={{ gitlab_runner_package_version }}"
gitlab_runner_package_state: present
when: gitlab_runner_package_version is defined

Expand All @@ -42,16 +43,21 @@
selection: install
when: "'gitlab-runner' in ansible_facts.packages"

- name: (Debian) Install GitLab Runner
- name: (Debian) Unhold GitLab Runner Helper version
changed_when: false
ansible.builtin.dpkg_selections:
name: "{{ gitlab_runner_helper_package_name }}"
selection: install
when: "'gitlab-runner-helper-images' in ansible_facts.packages"

- name: (Debian) Install GitLab Runner Helpers
ansible.builtin.apt:
name: "{{ gitlab_runner_package }}"
name: "{{ gitlab_runner_helper_package }}"
state: "{{ gitlab_runner_package_state }}"
allow_change_held_packages: true
allow_downgrade: true
become: true
environment:
GITLAB_RUNNER_DISABLE_SKEL: "true"
when: ansible_distribution_release in ["buster", "focal", "jammy"]
when: gitlab_runner_package_version is defined

- name: (Debian) Install GitLab Runner
ansible.builtin.apt:
Expand All @@ -60,7 +66,6 @@
allow_change_held_packages: true
allow_downgrade: true
become: true
when: ansible_distribution_release not in ["buster", "focal", "jammy"]

- name: (Debian) Hold GitLab Runner version
ansible.builtin.dpkg_selections:
Expand All @@ -69,6 +74,13 @@
when: gitlab_runner_package_version is defined
changed_when: false

- name: (Debian) Hold GitLab Runner Helpers version
ansible.builtin.dpkg_selections:
name: "{{ gitlab_runner_helper_package_name }}"
selection: hold
when: gitlab_runner_package_version is defined
changed_when: false

- name: (Debian) Remove ~/gitlab-runner/.bash_logout on debian buster and ubuntu focal
ansible.builtin.file:
path: /home/gitlab-runner/.bash_logout
Expand Down
Loading