oblachno-oss/grm
1
0
Fork 0
Code Issues Pull Requests Actions 14 Packages Projects Releases Wiki Activity

refactor: rootless Docker, fix auto-merge, molecule platform matrix

Browse Source 
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>
This commit is contained in:
Emil Simeonov
2026-06-20 21:02:52 +02:00
co-authored by Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
parent 0c6c735000
commit 55c2746569
71 changed files with 2444 additions and 1277 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/integration/test_lifecycle.py
+19 -10
View File
@@ -27,46 +27,55 @@ class TestLifecycleCLI:
mock_manager.install.assert_called_once()
# Start
result = runner.invoke(cli, ["start", "host1", "--user", "ubuntu", "--name", "r1"])
result = runner.invoke(cli, ["start", "r1", "--host", "host1", "--user", "ubuntu", "--no-ask-become-pass"])
assert result.exit_code == 0
mock_manager.start.assert_called_once_with(
host="host1", user="ubuntu", name="r1", mode="docker", ask_become_pass=False
host="host1", user="ubuntu", name="r1", key=None, ask_become_pass=False
)
# Status
result = runner.invoke(cli, ["status", "host1", "--user", "ubuntu", "--name", "r1"])
result = runner.invoke(cli, ["status", "r1", "--host", "host1", "--user", "ubuntu", "--no-ask-become-pass"])
assert result.exit_code == 0
mock_manager.status.assert_called_once_with(
host="host1", user="ubuntu", name="r1", mode="docker", ask_become_pass=False
host="host1", user="ubuntu", name="r1", key=None, ask_become_pass=False
)
# Stop
result = runner.invoke(cli, ["stop", "host1", "--user", "ubuntu", "--name", "r1"])
result = runner.invoke(cli, ["stop", "r1", "--host", "host1", "--user", "ubuntu", "--no-ask-become-pass"])
assert result.exit_code == 0
mock_manager.stop.assert_called_once_with(host="host1", user="ubuntu", name="r1", ask_become_pass=False)
mock_manager.stop.assert_called_once_with(
host="host1", user="ubuntu", name="r1", key=None, ask_become_pass=False
)
# Disable
result = runner.invoke(cli, ["disable", "host1", "--user", "ubuntu", "--name", "r1", "--token", "tok"])
result = runner.invoke(
cli,
["disable", "r1", "--host", "host1", "--user", "ubuntu", "--token", "tok", "--no-ask-become-pass"],
)
assert result.exit_code == 0
mock_manager.disable.assert_called_once_with(
host="host1",
user="ubuntu",
name="r1",
key=None,
token="tok",
gitea_url="https://git.example.com",
mode="docker",
ask_become_pass=False,
)
# Remove
result = runner.invoke(cli, ["remove", "host1", "--user", "ubuntu", "--name", "r1", "--token", "tok"])
result = runner.invoke(
cli,
["remove", "r1", "--host", "host1", "--user", "ubuntu", "--token", "tok", "--no-ask-become-pass"],
)
assert result.exit_code == 0
mock_manager.remove.assert_called_once_with(
host="host1",
user="ubuntu",
name="r1",
key=None,
token="tok",
gitea_url="https://git.example.com",
mode="docker",
ask_become_pass=False,
force=False,
)