Bug fixes 2.x pr devel 2.x

roles/debian/gitlab_runner/defaults/main.yml

@@ -2,6 +2,29 @@
 gitlab_runner:
   apt_origin: "origin=packages.gitlab.com/runner/gitlab-runner,codename=${distro_codename},label=gitlab-runner" # used by apt_unattended_upgrades
   apt_signed_by: https://packages.gitlab.com/runner/gitlab-runner/gpgkey
+  use_docker: false # set to true to install Docker and use the 'docker' executor
+  install_fargate: false
+  restart: true # set to false if you're applying settings to a server responsible for its own runners
+  username: "{{ ce_deploy.username }}"
+  docker_group: "docker"
+  runner_workingdir: "/home/{{ ce_deploy.username }}/build"
+  runner_config: "/etc/gitlab-runner/config.toml"
+  # see https://gitlab.com/gitlab-org/ci-cd/custom-executor-drivers/fargate/-/tree/master/docs
+  fargate:
+    cluster: "my-cluster" # ECS cluster name
+    profile: "example" # AWS boto profile name - can be substituted for "{{ _aws_profile }}" if set
+    region: "eu-west-1" # AWS region name - can be substituted for "{{ _aws_region }}" if set
+    subnet: "subnet-abcdef123456" # subnet ID
+    security_group: "my-security-group" # SG name
+    task_definition: "my-task:1" # task definition in format name:revision, if revision is not provided ECS will use latest
+    public_ip: "false" # if your containers need a public IP assigning
+    version: "1.4.0" # Fargate platform version
+    metadata_dir: "/opt/gitlab-runner/metadata"
+    ssh_user: "root"
+    ssh_port: 22
+  ##################################################
+  # @TODO - these variables are not currently used #
+  ##################################################
   concurrent_jobs: 10
   check_interval: 0
   session_timeout: 1800
@@ -28,22 +51,6 @@ gitlab_runner:
     #  run_args: '["--config", "/etc/gitlab-runner/fargate.toml", "custom", "run"]'
     #  cleanup_exec: "/opt/gitlab-runner/fargate"
     #  cleanup_args: '["--config", "/etc/gitlab-runner/fargate.toml", "custom", "cleanup"]'
-  install_fargate: false
-  restart: true # set to false if you're applying settings to a server responsible for its own runners
-  username: "{{ ce_deploy.username }}"
-  docker_group: "docker"
-  runner_workingdir: "/home/{{ ce_deploy.username }}/build"
-  runner_config: "/etc/gitlab-runner/config.toml"
-  # see https://gitlab.com/gitlab-org/ci-cd/custom-executor-drivers/fargate/-/tree/master/docs
-  fargate:
-    cluster: "my-cluster" # ECS cluster name
-    profile: "example" # AWS boto profile name - can be substituted for "{{ _aws_profile }}" if set
-    region: "eu-west-1" # AWS region name - can be substituted for "{{ _aws_region }}" if set
-    subnet: "subnet-abcdef123456" # subnet ID
-    security_group: "my-security-group" # SG name
-    task_definition: "my-task:1" # task definition in format name:revision, if revision is not provided ECS will use latest
-    public_ip: "false" # if your containers need a public IP assigning
-    version: "1.4.0" # Fargate platform version
-    metadata_dir: "/opt/gitlab-runner/metadata"
-    ssh_user: "root"
-    ssh_port: 22
+  ##################################################
+  # End @TODO                                      #
+  ##################################################

roles/debian/gitlab_runner/tasks/main.yml

@@ -45,61 +45,73 @@
 # gitlab-runner register --url https://gitlab.com/ --registration-token TOKEN_HERE --name fargate-test-runner --run-untagged --executor custom -n
 # This will automatically update /etc/gitlab-runner/config.toml
 
-# Populates the _aws_security_group_list variable used in fargate.toml.j2
-- name: Generate security group information.
-  ansible.builtin.include_role:
-    name: aws/aws_security_groups
-    apply:
-      delegate_to: localhost # this is how you delegate the include_role module
-  vars:
-    aws_security_groups:
-      profile: "{{ gitlab_runner.fargate.profile }}"
-      region: "{{ gitlab_runner.fargate.region }}"
-      group_names:
-        - "{{ gitlab_runner.fargate.security_group }}"
-      return_type: ids
-  when: gitlab_runner.install_fargate
+# @TODO support different runner types - MPV custom (Fargate) and shell
 
-- name: Create the Fargate driver directory if it does not exist.
-  ansible.builtin.file:
-    path: /opt/gitlab-runner
-    state: directory
-    mode: '0755'
-    owner: root
-    group: root
-  become: true
-  when: gitlab_runner.install_fargate
-
-- name: Install the Fargate driver.
-  ansible.builtin.get_url:
-    url: https://gitlab-runner-custom-fargate-downloads.s3.amazonaws.com/latest/fargate-linux-amd64
-    dest: /opt/gitlab-runner/fargate
-    mode: 0755
-  become: true
+# Populates the _aws_security_group_list variable used in fargate.toml.j2
+- name: Install Fargate runner.
   when: gitlab_runner.install_fargate
-
-- name: Place the Fargate configuration file.
-  ansible.builtin.template:
-    src: fargate.toml.j2
-    dest: /etc/gitlab-runner/fargate.toml
-    owner: root
-    group: root
-    force: true
-  become: true
-  when:
-    - gitlab_runner.install_fargate
-    - gitlab_runner.fargate | length > 0
-
-- name: Ensure the Fargate metadata directory exists.
-  ansible.builtin.file:
-    path: /opt/gitlab-runner/metadata
-    state: directory
-    mode: '0755'
-    owner: root
-    group: root
-  become: true
-  when:
-    - gitlab_runner.install_fargate
+  block:
+    - name: Generate security group information.
+      ansible.builtin.include_role:
+        name: aws/aws_security_groups
+        apply:
+          delegate_to: localhost # this is how you delegate the include_role module
+      vars:
+        aws_security_groups:
+          profile: "{{ gitlab_runner.fargate.profile }}"
+          region: "{{ gitlab_runner.fargate.region }}"
+          group_names:
+            - "{{ gitlab_runner.fargate.security_group }}"
+          return_type: ids
+
+    - name: Create the Fargate driver directory if it does not exist.
+      ansible.builtin.file:
+        path: /opt/gitlab-runner
+        state: directory
+        mode: '0755'
+        owner: root
+        group: root
+      become: true
+
+    - name: Install the Fargate driver.
+      ansible.builtin.get_url:
+        url: https://gitlab-runner-custom-fargate-downloads.s3.amazonaws.com/latest/fargate-linux-amd64
+        dest: /opt/gitlab-runner/fargate
+        mode: 0755
+      become: true
+
+    - name: Place the Fargate configuration file.
+      ansible.builtin.template:
+        src: fargate.toml.j2
+        dest: /etc/gitlab-runner/fargate.toml
+        owner: root
+        group: root
+        force: true
+      become: true
+      when:
+        - gitlab_runner.fargate | length > 0
+
+    - name: Ensure the Fargate metadata directory exists.
+      ansible.builtin.file:
+        path: /opt/gitlab-runner/metadata
+        state: directory
+        mode: '0755'
+        owner: root
+        group: root
+      become: true
+
+- name: Install Docker.
+  when: gitlab_runner.install_fargate or gitlab_runner.use_docker
+  block:
+    - name: Run docker_ce role to install Docker.
+      ansible.builtin.include_role:
+        name: debian/docker_ce
+
+    - name: Add the GitLab Runner user (usually the controller) to the docker group.
+      ansible.builtin.user:
+        name: "{{ gitlab_runner.username }}"
+        groups: "{{ gitlab_runner.docker_group }}"
+        append: true
 
 # @TODO inject the executor lines after any Fargate services in config.toml
 
@@ -145,18 +157,6 @@
   become: true
   when: gitlab_runner.restart
 
-- name: Run docker_ce role when Fargate driver to be installed.
-  ansible.builtin.include_role:
-    name: debian/docker_ce
-  when: gitlab_runner.install_fargate
-
-- name: Add the ce-provision user to the docker group.
-  ansible.builtin.user:
-    name: "{{ gitlab_runner.username }}"
-    groups: "{{ gitlab_runner.docker_group }}"
-    append: true
-  when: gitlab_runner.install_fargate
-
 # See https://docs.gitlab.com/runner/shells/index.html#shell-profile-loading
 - name: Delete $HOME/.bash_logout for the runner user if it exists.
   ansible.builtin.file: