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

Switch containers to use Ubuntu noble #134

Merged
merged 3 commits into from
Sep 10, 2024
Merged

Switch containers to use Ubuntu noble #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8bd67c1
ansible: Allow loading per-runner environment file
chantra Aug 21, 2024
adc2ad2
ansible: Make containers advertise "docker-noble-main" tag
chantra Aug 21, 2024
b796dc7
ansible: Switch containers to pull main-noble-{arch} container
chantra Aug 21, 2024
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 ansible/roles/runner/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions ansible/roles/runner/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
ansible.builtin.copy:
dest: "{{ runner_base_dir }}/runner_unit.env"
content: |
DOCKER_TAG={{ runner_docker_tag }}-{{ ansible_architecture }}
DOCKER_TAG={{ runner_docker_tag }}-{{ runner_docker_ubuntu_version }}-{{ ansible_architecture }}
mode: 0700
owner: root
group: root
Expand Down Expand Up @@ -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. #}
Expand Down Expand Up @@ -140,6 +140,8 @@
TimeoutStartSec=0
Restart=always
EnvironmentFile={{ runner_base_dir }}/runner_unit.env
# Optionally loaded file. Use this to override per runner environment
EnvironmentFile=-{{ runner_base_dir }}/runner_unit-%i.env
ExecStartPre=-/usr/bin/docker stop %p-%i
ExecStartPre=-/usr/bin/docker rm %p-%i
ExecStartPre=-/usr/bin/docker pull {{ runner_docker_image_url }}:${DOCKER_TAG}
Expand Down
Loading