From 7230269e57beb27442cce734bcab9814dedfa83a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hern=C3=A2ni=20Marques?= <hernani+magikoopa@vecirex.net>
Date: Sat, 5 Sep 2026 08:47:23 +0200
Subject: [PATCH] feat: ubuntu noble apt-src ensure track on koopa

---
 host-agent/README.md                          |  2 ++
 .../ensure-apt-deploy-test-containers.sh      | 20 +++++++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/host-agent/README.md b/host-agent/README.md
index bb438d6..1cbbf5b 100644
--- a/host-agent/README.md
+++ b/host-agent/README.md
@@ -51,12 +51,14 @@ Needs explorer secrets (`SECRETS_ROOT` / bank-explorer password). Wall ~3h (`RUN
 | `koopa-taler-deploy-test-apt-src-trixie-testing` | **fresh** for `trixie-testing` |
 | `koopa-taler-deploy-test-apt-src-trixie-upgrade` | **upgrade**: initial install, then mytops-style `apt install` + `upgrade` |
 | `koopa-taler-deploy-test-apt-src-trixie-testing-upgrade` | **upgrade** for testing suite |
+| `koopa-taler-deploy-test-apt-src-ubuntu` | **fresh** Ubuntu 24.04 (`noble` @ deb.taler.net/apt/ubuntu) |
 
 ```bash
 # from ops workstation → triggers on koopa-external
 ./host-agent/run-aptdeploy.sh
 ./host-agent/run-aptdeploy.sh upgrade
 ./host-agent/run-aptdeploy.sh fresh
+./host-agent/run-aptdeploy.sh ubuntu
 ./host-agent/run-aptdeploy.sh check-only
 
 # on koopa
diff --git a/host-agent/ensure-apt-deploy-test-containers.sh b/host-agent/ensure-apt-deploy-test-containers.sh
index 5abd9c5..b9fa4a2 100755
--- a/host-agent/ensure-apt-deploy-test-containers.sh
+++ b/host-agent/ensure-apt-deploy-test-containers.sh
@@ -1,11 +1,12 @@
 #!/usr/bin/env bash
 # ensure-apt-deploy-test-containers.sh
 #
-# Four rootless podman containers on koopa (no nginx / no HTTPS):
+# Rootless podman containers on koopa (no nginx / no HTTPS):
 #
 #   Fresh rebuild when repo fingerprint changes:
 #     koopa-taler-deploy-test-apt-src-trixie
 #     koopa-taler-deploy-test-apt-src-trixie-testing
+#     koopa-taler-deploy-test-apt-src-ubuntu   (noble / ubuntu:24.04; mode ubuntu|all)
 #
 #   Persistent upgrade path (mytops upgrade.sh style):
 #     koopa-taler-deploy-test-apt-src-trixie-upgrade
@@ -24,12 +25,13 @@ mkdir -p "$STATE_DIR"
 # Packages we track for "new version → rebuild fresh containers"
 TRACK_PKGS="${APT_DEPLOY_TRACK_PKGS:-taler-merchant libtalermerchant libtalerexchange libdonau}"
 
-# Canonical four containers (keep). Everything else matching legacy names is removed.
+# Canonical containers (keep). Everything else matching legacy names is removed.
 CANONICAL_CONTAINERS=(
   koopa-taler-deploy-test-apt-src-trixie
   koopa-taler-deploy-test-apt-src-trixie-testing
   koopa-taler-deploy-test-apt-src-trixie-upgrade
   koopa-taler-deploy-test-apt-src-trixie-testing-upgrade
+  koopa-taler-deploy-test-apt-src-ubuntu
 )
 
 # Legacy / typo names from earlier iterations — always delete if present
@@ -348,7 +350,14 @@ ensure_upgrade() {
   upgrade_inside "$name"
 }
 
-MODE="${1:-all}"  # all | fresh | upgrade
+MODE="${1:-all}"  # all | fresh | upgrade | ubuntu
+
+ensure_ubuntu_noble() {
+  # Ubuntu 24.04 (noble) apt-src track — Freigabe 2026-09-05
+  IMG="${APT_DEPLOY_UBUNTU_IMAGE:-docker.io/library/ubuntu:24.04}" \
+    URI_BASE="${APT_DEPLOY_UBUNTU_URI:-https://deb.taler.net/apt/ubuntu}" \
+    ensure_fresh koopa-taler-deploy-test-apt-src-ubuntu noble taler.sources
+}
 
 case "$MODE" in
   all|fresh)
@@ -358,9 +367,12 @@ case "$MODE" in
   all|upgrade)
     ensure_upgrade koopa-taler-deploy-test-apt-src-trixie-upgrade         trixie         taler.sources
     ensure_upgrade koopa-taler-deploy-test-apt-src-trixie-testing-upgrade trixie-testing taler-testing.sources
+    ;;&
+  all|ubuntu)
+    ensure_ubuntu_noble
     ;;
   *)
-    echo "usage: $0 [all|fresh|upgrade]" >&2
+    echo "usage: $0 [all|fresh|upgrade|ubuntu]" >&2
     exit 2
     ;;
 esac