diff --git a/defaults/main.yml b/defaults/main.yml index 49eda19..dc3b30e 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -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 diff --git a/tasks/install-debian.yml b/tasks/install-debian.yml index bf6fae1..a9bdf5f 100644 --- a/tasks/install-debian.yml +++ b/tasks/install-debian.yml @@ -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 @@ -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: @@ -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: @@ -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