feat(configs): point hermes_infra at gitea admin/hermes ansible repos #8

Merged
admin merged 1 commits from hermes/brencher:feat/point-hermes-infra-at-gitea into main 2026-08-26 11:30:19 +02:00
Contributor

Summary

Switches backend/configs/hermes_infra.py from the legacy url= form (pointing at the unreachable github.com/rudolf1/uber_backup.git) to the new remotes=[{name, url}, ...] form introduced by PR #3 (named-remotes), pointing at the actual gitea repos where the ansible stack lives.

What's in this PR

  • backend/configs/hermes_infra.py — single file, +22/-1
    • GitClone(url="https://github.com/rudolf1/uber_backup.git", branchNamePrefix="ansible")
      →
      GitClone(remotes=[{"name": "gitea_hermes", "url": "https://gitea.rudolf.keenetic.link/hermes/ansible"}, {"name": "gitea_admin", "url": "https://gitea.rudolf.keenetic.link/admin/ansible"}])
    • branchNamePrefix is dropped (it would be a silent no-op: GitClone only applies its prefix refspec to a remote named origin per backend/steps/git.py ~L104, and neither remote here is named origin)

Why this config specifically

  • hermes_infra.py is the config that deploys hermes_squid/stack-compose.yml — i.e. it is what brings the sidecars added in admin/ansible#1 (the docker_socket_proxy + brencher-state-proxy from earlier today) to a running swarm. Pointing its clone at the unreachable github URL meant the deploy path was broken even though the file looked correct.
  • uber_backup.git doesn't exist on gitea anyway (only admin/ansible, hermes/ansible, admin/brencher, hermes/brencher exist) — so the old URL was always wrong, not just unreachable.
  • github.com returns HTTP 403 on CONNECT tunnel from the brencher container's egress proxy — verified in admin/brencher#4 (PR #4 / commit 653aee9).

Scope decision: only hermes_infra.py was migrated

The other open configs (registry.py, gitea.py, hermes.py, immich.py, gmail_mcp.py, torrserv_proxy.py) still use the legacy form. They're intentionally left untouched — this PR keeps the migration scope narrow on hermes_infra only, as requested. A future follow-up PR can migrate them once the upstream uber_backup / reverseproxy mirrors exist on gitea (they don't right now).

Verification (sandbox, no docker daemon)

  • python3 -m py_compile backend/configs/hermes_infra.py — OK
  • Real import via from configs import hermes_infra:
    • clone.remotes is a 2-entry list [gitea_hermes, gitea_admin], clone.urls derived from it
    • no github.com substring anywhere in the constructed config
    • clone.branchNamePrefix == '' (not just unset)
    • env.id == "hermes_infra", pipeline unchanged
    • deploy step docker_compose_path == "hermes_squid/stack-compose.yml"
    • deploy step stack_name == "hermes_infra"
  • pytest: 26/26 passed on the no-docker / no-playwright suite (test_dummy, test_caching_step, test_cached_env, test_git_integration)
  • mypy --no-incremental --follow-imports=silent: Success: no issues found in 1 source file
  • End-to-end smoke test: built a parallel GitClone(remotes=[...]) with both URLs pointed at file:///tmp/ansible-upstream, ran clone.progress():
    • both named remotes created in the temp clone
    • 4 branches discovered (master + feat/docker-socket-proxy × 2 remotes)
    • feat/docker-socket-proxy visible on both gitea_admin and gitea_hermes
    • no github.com in any remote URL

What was NOT verified in the sandbox

  • HTTPS clone from gitea.rudolf.keenetic.link on the live brencher-bot — requires the brencher container's git credentials to have push rights on admin/ansible (the live-deploy source). Sandbox can't simulate this.
  • end-to-end docker stack deploy hermes_infra — needs a real swarm

After merge

After this PR merges into admin/brencher:main, the next brencher deploy of the hermes_infra environment will clone from gitea instead of the unreachable github URL. Combined with admin/ansible#1 (which adds the new services to hermes_squid/stack-compose.yml) and admin/brencher#4 (which registers docker_socket_proxy in the PROFILES env var), the full chain is:

  1. brencher clones ansible from gitea.rudolf.keenetic.link/{hermes,admin}/ansible
  2. Checks out a merged branch containing the new sidecars
  3. Builds (only sarg — docker_socket_proxy and brencher-state-proxy use upstream images, no build)
  4. docker stack deploy hermes_infra rolls out the full stack

Commit history

* 9a0cd90 (HEAD -> feat/point-hermes-infra-at-gitea, origin/feat/point-hermes-infra-at-gitea)
      feat(configs): point hermes_infra at gitea admin/hermes ansible repos
* e533174 Allow naming each GitClone remote explicitly (#3)         (upstream/main tip)
## Summary Switches `backend/configs/hermes_infra.py` from the legacy `url=` form (pointing at the unreachable `github.com/rudolf1/uber_backup.git`) to the new `remotes=[{name, url}, ...]` form introduced by PR #3 (named-remotes), pointing at the actual gitea repos where the ansible stack lives. ## What's in this PR - `backend/configs/hermes_infra.py` — single file, +22/-1 - `GitClone(url="https://github.com/rudolf1/uber_backup.git", branchNamePrefix="ansible")` → `GitClone(remotes=[{"name": "gitea_hermes", "url": "https://gitea.rudolf.keenetic.link/hermes/ansible"}, {"name": "gitea_admin", "url": "https://gitea.rudolf.keenetic.link/admin/ansible"}])` - `branchNamePrefix` is dropped (it would be a silent no-op: `GitClone` only applies its prefix refspec to a remote named `origin` per `backend/steps/git.py` ~L104, and neither remote here is named `origin`) ## Why this config specifically - `hermes_infra.py` is the config that **deploys `hermes_squid/stack-compose.yml`** — i.e. it is what brings the sidecars added in `admin/ansible#1` (the docker_socket_proxy + brencher-state-proxy from earlier today) to a running swarm. Pointing its clone at the unreachable github URL meant the deploy path was broken even though the file looked correct. - `uber_backup.git` doesn't exist on gitea anyway (only `admin/ansible`, `hermes/ansible`, `admin/brencher`, `hermes/brencher` exist) — so the old URL was always wrong, not just unreachable. - github.com returns HTTP 403 on CONNECT tunnel from the brencher container's egress proxy — verified in `admin/brencher#4` (PR #4 / commit `653aee9`). ## Scope decision: only `hermes_infra.py` was migrated The other open configs (`registry.py`, `gitea.py`, `hermes.py`, `immich.py`, `gmail_mcp.py`, `torrserv_proxy.py`) still use the legacy form. They're intentionally left untouched — this PR keeps the migration scope narrow on `hermes_infra` only, as requested. A future follow-up PR can migrate them once the upstream uber_backup / reverseproxy mirrors exist on gitea (they don't right now). ## Verification (sandbox, no docker daemon) - `python3 -m py_compile backend/configs/hermes_infra.py` — OK - Real import via `from configs import hermes_infra`: - `clone.remotes` is a 2-entry list `[gitea_hermes, gitea_admin]`, `clone.urls` derived from it - no `github.com` substring anywhere in the constructed config - `clone.branchNamePrefix == ''` (not just unset) - `env.id == "hermes_infra"`, pipeline unchanged - `deploy step docker_compose_path == "hermes_squid/stack-compose.yml"` - `deploy step stack_name == "hermes_infra"` - pytest: **26/26** passed on the no-docker / no-playwright suite (`test_dummy`, `test_caching_step`, `test_cached_env`, `test_git_integration`) - mypy `--no-incremental --follow-imports=silent`: `Success: no issues found in 1 source file` - **End-to-end smoke test**: built a parallel `GitClone(remotes=[...])` with both URLs pointed at `file:///tmp/ansible-upstream`, ran `clone.progress()`: - both named remotes created in the temp clone - 4 branches discovered (`master` + `feat/docker-socket-proxy` × 2 remotes) - `feat/docker-socket-proxy` visible on both `gitea_admin` and `gitea_hermes` - no `github.com` in any remote URL ## What was NOT verified in the sandbox - HTTPS clone from `gitea.rudolf.keenetic.link` on the live brencher-bot — requires the brencher container's git credentials to have push rights on `admin/ansible` (the live-deploy source). Sandbox can't simulate this. - end-to-end `docker stack deploy hermes_infra` — needs a real swarm ## After merge After this PR merges into `admin/brencher:main`, the next brencher deploy of the `hermes_infra` environment will clone from gitea instead of the unreachable github URL. Combined with `admin/ansible#1` (which adds the new services to `hermes_squid/stack-compose.yml`) and `admin/brencher#4` (which registers `docker_socket_proxy` in the PROFILES env var), the full chain is: 1. brencher clones ansible from `gitea.rudolf.keenetic.link/{hermes,admin}/ansible` 2. Checks out a merged branch containing the new sidecars 3. Builds (only `sarg` — `docker_socket_proxy` and `brencher-state-proxy` use upstream images, no build) 4. `docker stack deploy hermes_infra` rolls out the full stack ## Commit history ``` * 9a0cd90 (HEAD -> feat/point-hermes-infra-at-gitea, origin/feat/point-hermes-infra-at-gitea) feat(configs): point hermes_infra at gitea admin/hermes ansible repos * e533174 Allow naming each GitClone remote explicitly (#3) (upstream/main tip) ```
hermes added 1 commit 2026-08-25 22:53:01 +02:00
backend/configs/hermes_infra.py was the last open config still using
the legacy url=/branchNamePrefix= form, pointing at
https://github.com/rudolf1/uber_backup.git. That URL never resolved
(uber_backup doesn't exist on gitea) and github.com itself is
unreachable from the brencher container (proxy HTTP 403 on CONNECT).

Switch to the new remotes=[{name,url},...] form introduced by PR #3
(named-remotes), pointing at the actual repos that exist:

  - gitea_hermes: https://gitea.rudolf.keenetic.link/hermes/ansible
  - gitea_admin:  https://gitea.rudolf.keenetic.link/admin/ansible

Same form used in backend/configs/brencher.py (after PR #3) and
backend/configs/docker_socket_proxy.py (PR #4). branchNamePrefix
dropped: GitClone only applies its prefix refspec to a remote named
"origin" (backend/steps/git.py ~L104), and neither remote here is
named "origin".

Scope: hermes_infra.py only. The other open configs (registry.py,
gitea.py, hermes.py, immich.py, gmail_mcp.py, torrserv_proxy.py)
still use the legacy form and are intentionally left for a future
follow-up PR.

Verified locally (no docker daemon):
  - py_compile backend/configs/hermes_infra.py: OK
  - Real import: clone.remotes is 2-entry list [gitea_hermes, gitea_admin],
    clone.urls derived from it, no github.com anywhere
  - env.id == 'hermes_infra', pipeline unchanged
  - deploy step: docker_compose_path == 'hermes_squid/stack-compose.yml'
  - pytest: 26/26 on no-docker/no-playwright suite
  - mypy: Success: no issues found
  - End-to-end smoke test (GitClone.progress() with both remotes pointed
    at file:///tmp/ansible-upstream):
      - both remotes created in the temp clone
      - 4 branches discovered (master + feat/docker-socket-proxy on each)
      - feat/docker-socket-proxy visible on both gitea_hermes and gitea_admin
      - no github.com in any remote URL

After this PR merges, the brencher-bot deploying hermes_infra will
clone from gitea (not github.com), so it can actually reach the
source.
admin merged commit ba17865a49 into main 2026-08-26 11:30:19 +02:00
admin deleted branch feat/point-hermes-infra-at-gitea 2026-08-26 11:30:21 +02:00
Sign in to join this conversation.
No Reviewers
No labels
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: admin/brencher#8