From a52c0514b6c6ea6aa7d88bed01d42454ac24823f Mon Sep 17 00:00:00 2001 From: Rafal Lisewski Date: Thu, 29 Jun 2023 09:21:37 +0200 Subject: [PATCH] Decouple scripts from registration command This commit separates the inclusion of scripts from the registration command. ref: https://github.com/riemers/ansible-gitlab-runner/issues/270 --- tasks/register-runner-container.yml | 9 --------- tasks/register-runner-windows.yml | 9 --------- tasks/register-runner.yml | 9 --------- 3 files changed, 27 deletions(-) diff --git a/tasks/register-runner-container.yml b/tasks/register-runner-container.yml index a10a6f2..6344de6 100644 --- a/tasks/register-runner-container.yml +++ b/tasks/register-runner-container.yml @@ -24,15 +24,6 @@ {% for env_var in gitlab_runner.env_vars|default([]) %} --env '{{ env_var }}' {% endfor %} - {% if gitlab_runner.pre_clone_script|default(false) %} - --pre-clone-script "{{ gitlab_runner.pre_clone_script }}" - {% endif %} - {% if gitlab_runner.pre_build_script|default(false) %} - --pre-build-script "{{ gitlab_runner.pre_build_script }}" - {% endif %} - {% if gitlab_runner.post_build_script|default(false) %} - --post-build-script "{{ gitlab_runner.post_build_script }}" - {% endif %} --docker-image '{{ gitlab_runner.docker_image|default("alpine") }}' {% if gitlab_runner.docker_privileged|default(false) %} --docker-privileged diff --git a/tasks/register-runner-windows.yml b/tasks/register-runner-windows.yml index 1c198b1..cb45605 100644 --- a/tasks/register-runner-windows.yml +++ b/tasks/register-runner-windows.yml @@ -27,18 +27,9 @@ {% for env_var in gitlab_runner.env_vars|default([]) %} --env '{{ env_var }}' {% endfor %} - {% if gitlab_runner.pre_clone_script|default(false) %} - --pre-clone-script '{{ gitlab_runner.pre_clone_script }}' - {% endif %} - {% if gitlab_runner.pre_build_script|default(false) %} - --pre-build-script '{{ gitlab_runner.pre_build_script }}' - {% endif %} {% if gitlab_runner.tls_ca_file|default(false) %} --tls-ca-file "{{ gitlab_runner.tls_ca_file }}" {% endif %} - {% if gitlab_runner.post_build_script|default(false) %} - --post-build-script '{{ gitlab_runner.post_build_script }}' - {% endif %} --docker-image '{{ gitlab_runner.docker_image|default("alpine") }}' {% if gitlab_runner.docker_privileged|default(false) %} --docker-privileged diff --git a/tasks/register-runner.yml b/tasks/register-runner.yml index 757d550..81704bf 100644 --- a/tasks/register-runner.yml +++ b/tasks/register-runner.yml @@ -35,18 +35,9 @@ {% for env_var in gitlab_runner.env_vars|default([]) %} --env '{{ env_var }}' {% endfor %} - {% if gitlab_runner.pre_clone_script|default(false) %} - --pre-clone-script "{{ gitlab_runner.pre_clone_script }}" - {% endif %} - {% if gitlab_runner.pre_build_script|default(false) %} - --pre-build-script "{{ gitlab_runner.pre_build_script }}" - {% endif %} {% if gitlab_runner.tls_ca_file|default(false) %} --tls-ca-file "{{ gitlab_runner.tls_ca_file }}" {% endif %} - {% if gitlab_runner.post_build_script|default(false) %} - --post-build-script "{{ gitlab_runner.post_build_script }}" - {% endif %} --docker-image '{{ gitlab_runner.docker_image|default("alpine") }}' {% if gitlab_runner.docker_helper_image is defined %} --docker-helper-image "{{ gitlab_runner.docker_helper_image }}"