oblachno-oss/grm
3
0
Fork 0
Code Issues 31 Pull Requests Actions Packages Projects Releases 19 Wiki Activity

refactor: rootless Docker, fix auto-merge, molecule platform matrix
CI / quality (pull_request) Failing after 1m4s
Details
CI / molecule-tests (0) (pull_request) Has been skipped
Details
CI / molecule-tests (1) (pull_request) Has been skipped
Details
CI / molecule-tests (2) (pull_request) Has been skipped
Details

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/unit/test_cli.py
+1 -56
View File
@@ -29,7 +29,6 @@ class TestCLI:
name=None,
token="tok",
gitea_url="https://git.example.com",
mode="docker",
admin_token="",
integration_retries=3,
labels=None,
@@ -51,7 +50,6 @@ class TestCLI:
name=None,
token="tok",
gitea_url="https://git.example.com",
mode="docker",
admin_token="",
integration_retries=3,
labels=None,
@@ -91,7 +89,6 @@ class TestCLI:
name=None,
token="tok",
gitea_url="https://git.example.com",
mode="docker",
admin_token=None,
integration_retries=3,
labels=None,
@@ -141,7 +138,6 @@ class TestCLI:
name="r1",
token="tok",
gitea_url="https://git.example.com",
mode="docker",
admin_token="",
integration_retries=3,
labels=None,
@@ -163,29 +159,6 @@ class TestCLI:
name=None,
token="tok",
gitea_url="https://git.example.com",
mode="docker",
admin_token="",
integration_retries=3,
labels=None,
ask_become_pass=True,
)
@patch("gitea_runner_manager.cli.RunnerManager")
def test_install_binary_mode(self, mock_manager_class: MagicMock) -> None:
mock_manager = MagicMock()
mock_manager_class.return_value = mock_manager
runner = CliRunner(env={"GITEA_URL": "https://git.example.com", "REPO_TOKEN": "", "GITEA_RUNNER_LABELS": ""})
result = runner.invoke(cli, ["install", "host1", "--user", "ubuntu", "--token", "tok", "--mode", "binary"])
assert result.exit_code == 0
mock_manager.install.assert_called_once_with(
host="host1",
user="ubuntu",
key=None,
name=None,
token="tok",
gitea_url="https://git.example.com",
mode="binary",
admin_token="",
integration_retries=3,
labels=None,
@@ -230,7 +203,6 @@ class TestCLI:
user="ubuntu",
key="/key",
version="v0.2.0",
mode="docker",
ask_become_pass=True,
)
@@ -247,24 +219,6 @@ class TestCLI:
user="ubuntu",
key=None,
version=None,
mode="docker",
ask_become_pass=True,
)
@patch("gitea_runner_manager.cli.RunnerManager")
def test_update_binary_mode(self, mock_manager_class: MagicMock) -> None:
mock_manager = MagicMock()
mock_manager_class.return_value = mock_manager
runner = CliRunner()
result = runner.invoke(cli, ["update", "host1", "--user", "ubuntu", "--mode", "binary"])
assert result.exit_code == 0
mock_manager.update.assert_called_once_with(
host="host1",
user="ubuntu",
key=None,
version=None,
mode="binary",
ask_become_pass=True,
)
@@ -294,7 +248,6 @@ class TestCLI:
host=None,
user=None,
key=None,
mode=None,
ask_become_pass=True,
)
@@ -304,14 +257,13 @@ class TestCLI:
mock_manager_class.return_value = mock_manager
runner = CliRunner()
result = runner.invoke(cli, ["start", "r1", "--host", "newhost", "--user", "newuser", "--mode", "binary"])
result = runner.invoke(cli, ["start", "r1", "--host", "newhost", "--user", "newuser"])
assert result.exit_code == 0
mock_manager.start.assert_called_once_with(
name="r1",
host="newhost",
user="newuser",
key=None,
mode="binary",
ask_become_pass=True,
)
@@ -362,7 +314,6 @@ class TestCLI:
key=None,
token="tok",
gitea_url="https://git.example.com",
mode=None,
ask_become_pass=True,
)
@@ -396,7 +347,6 @@ class TestCLI:
key=None,
token="tok",
gitea_url="https://git.example.com",
mode=None,
ask_become_pass=True,
)
@@ -426,7 +376,6 @@ class TestCLI:
host=None,
user=None,
key=None,
mode=None,
ask_become_pass=True,
)
@@ -445,7 +394,6 @@ class TestCLI:
key=None,
token="tok",
gitea_url="https://git.example.com",
mode=None,
force=False,
ask_become_pass=True,
)
@@ -465,7 +413,6 @@ class TestCLI:
key=None,
token="tok",
gitea_url="https://git.example.com",
mode=None,
force=True,
ask_become_pass=True,
)
@@ -552,7 +499,6 @@ class TestCLI:
key=None,
token="tok",
gitea_url="https://git.example.com",
mode=None,
force=False,
ask_become_pass=True,
)
@@ -578,7 +524,6 @@ class TestCLI:
"name": "r1",
"host": "10.0.0.1",
"user": "ubuntu",
"mode": "docker",
"labels": "docker:docker://alpine:latest",
"status": "active",
},