Emil SimeonovandDevin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
55c2746569
Three major improvements: 1. Rootless Docker refactor: Removes docker/binary modes, unifies to rootless Docker with per-runner system users. Each runner gets its own rootless Docker daemon, systemd user service, and isolated environment. Simplifies CLI (removes --mode option), Ansible role (single code path), and molecule scenarios (removes binary scenario). 2. Auto-merge fix: Fixes status check context mismatch in branch protection (was requiring "lint", "unit-tests", "molecule-tests" but actual contexts are "CI / quality", "CI / molecule-tests*"). Adds retry/wait logic to auto_merge.py that polls commit statuses for up to 15 minutes before attempting merge, eliminating the chicken-and-egg problem where auto-merge would fail because CI hadn't completed yet. 3. Molecule platform matrix: Adds OS platform matrix to CI — all 6 scenarios now run on all 4 supported OSes (ubuntu-2204, ubuntu-2404, debian-12, archlinux) = 24 test pairs distributed across 3 parallel runners. Updates distribute_molecule.py to distribute (scenario, platform) pairs. Updates Makefile with molecule-all target for local multi-platform testing. Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
74 lines
2.2 KiB
YAML
74 lines
2.2 KiB
YAML
---
|
|
- name: Install rootless Docker dependencies (Debian/Ubuntu)
|
|
ansible.builtin.apt:
|
|
name:
|
|
- uidmap
|
|
- slirp4netns
|
|
- fuse-overlayfs
|
|
- docker-ce
|
|
- docker-ce-cli
|
|
- docker-ce-rootless-extras
|
|
- containerd.io
|
|
- docker-compose-plugin
|
|
- rsync
|
|
state: present
|
|
update_cache: true
|
|
cache_valid_time: 0
|
|
when: ansible_facts['os_family'] == 'Debian'
|
|
|
|
- name: Install rootless Docker dependencies (Arch Linux)
|
|
community.general.pacman:
|
|
name:
|
|
- docker
|
|
- docker-compose
|
|
- slirp4netns
|
|
- fuse-overlayfs
|
|
- rsync
|
|
state: present
|
|
update_cache: true
|
|
when: ansible_facts['os_family'] == 'Archlinux'
|
|
|
|
- name: Check if rootless Docker is already set up
|
|
ansible.builtin.stat:
|
|
path: "{{ gitea_runner_home }}/.config/systemd/user/docker.service"
|
|
register: rootless_docker_check
|
|
|
|
- name: Set up rootless Docker for runner user
|
|
ansible.builtin.command: dockerd-rootless-setuptool.sh install
|
|
args:
|
|
creates: "{{ gitea_runner_home }}/.config/systemd/user/docker.service"
|
|
become: true
|
|
become_user: "{{ gitea_runner_service_user }}"
|
|
environment:
|
|
XDG_RUNTIME_DIR: "/run/user/{{ gitea_runner_uid }}"
|
|
when: not rootless_docker_check.stat.exists
|
|
|
|
- name: Start rootless Docker daemon (systemd user service)
|
|
ansible.builtin.command: systemctl --user start docker
|
|
become: true
|
|
become_user: "{{ gitea_runner_service_user }}"
|
|
environment:
|
|
XDG_RUNTIME_DIR: "/run/user/{{ gitea_runner_uid }}"
|
|
changed_when: true
|
|
|
|
- name: Enable rootless Docker daemon (systemd user service)
|
|
ansible.builtin.command: systemctl --user enable docker
|
|
become: true
|
|
become_user: "{{ gitea_runner_service_user }}"
|
|
environment:
|
|
XDG_RUNTIME_DIR: "/run/user/{{ gitea_runner_uid }}"
|
|
changed_when: true
|
|
|
|
- name: Wait for rootless Docker daemon to be ready
|
|
ansible.builtin.command: docker version
|
|
become: true
|
|
become_user: "{{ gitea_runner_service_user }}"
|
|
environment:
|
|
DOCKER_HOST: "unix:///run/user/{{ gitea_runner_uid }}/docker.sock"
|
|
XDG_RUNTIME_DIR: "/run/user/{{ gitea_runner_uid }}"
|
|
register: docker_ready
|
|
until: docker_ready.rc == 0
|
|
retries: 10
|
|
delay: 2
|
|
changed_when: false
|