ansible: Make containers advertise "docker-noble-main" tag

This tag is used to transition containers to run Ubuntu noble. Mind that currently, the container actually pulled will still be focal until either DOCKER_TAG is changed to "main-noble-{arch}", or DOCKER_TAG is overridden in the relevant `/etc/actions-runner/runner_unit-\d\d.env` file. Signed-off-by: Manu Bretelle <[email protected]>
libbpf · Sep 10, 2024 · 3e1528d · 3e1528d
1 parent 635895d
commit 3e1528d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/ansible/roles/runner/defaults/main.yml b/ansible/roles/runner/defaults/main.yml
@@ -8,6 +8,7 @@ runner_tmpfs_options:
 runner_gh_token_default: replace with your token
 runner_gh_user_default: replace with your GH user
 runner_docker_tag: main
+runner_docker_ubuntu_version: noble
 runner_docker_image_url: ghcr.io/kernel-patches/runner
 runner_docker_healthcheck: ""
 runner_docker_mount_volume: false

diff --git a/ansible/roles/runner/tasks/main.yml b/ansible/roles/runner/tasks/main.yml
@@ -96,7 +96,7 @@
     content: |
       ACCESS_TOKEN={{ runner_gh_tokens[item.0.name] | default(runner_gh_token_default) }}
       RUNNER_WORKDIR={{ runner_workdir }}
-      LABELS={{ ansible_architecture }},docker-{{ runner_docker_tag }}
+      LABELS={{ ansible_architecture }},docker-{{ runner_docker_ubuntu_version }}-{{ runner_docker_tag }}
       EPHEMERAL=true
       {% if '/' in item.0.name %}
       {# The presence of a / in the name signifies that we have a repo name, otherwise we assume an organization name. #}