From 511d4fcb3e4eba72aca7bac7161b02ab88ed4650 Mon Sep 17 00:00:00 2001 From: John Coffey Date: Wed, 30 Sep 2026 09:37:26 -0700 Subject: [PATCH] e2e: expect the ihasmail image from the Gitea registry Since 2026.9.22 the deploy pins ihasmail from registry.coffeylabs.org (config.IhasmailRepository), but the public e2e still looked for the ghcr.io name. Its sed matched nothing, so it failed with "does not pin ihasmail to a dated release: none" on a deploy that was correct. The check now uses the registry name, kept in one variable beside a note to keep it in step with the config. --- e2e/public.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/e2e/public.sh b/e2e/public.sh index 8f6bfe0..e3cc180 100755 --- a/e2e/public.sh +++ b/e2e/public.sh @@ -97,9 +97,11 @@ grep -q "certificate issued by CN=Pebble" "$WORK/deploy.log" || die "deploy did ok "deploy reported Stalwart's certificate" # No --ihasmail-image, so the deploy took the newest release -- and must have -# written it down as a dated tag, never the moving :latest. -image=$(sed -n 's/^ image: \(ghcr.io\/coffey-labs\/ihasmail[:@].*\)$/\1/p' "$DEPLOY/compose.yaml") -[[ "$image" =~ ^ghcr\.io/coffey-labs/ihasmail:[0-9]{4}\.[0-9]{1,2}\.[0-9]{1,2}-(pr[0-9]+|g[0-9a-f]+)$ ]] \ +# written it down as a dated tag, never the moving :latest. The repository is +# config.IhasmailRepository; keep the two in step. +repo=registry.coffeylabs.org/coffey-labs/ihasmail +image=$(grep -E "^ image: ${repo//./\\.}[:@]" "$DEPLOY/compose.yaml" | sed 's/^ image: //') +[[ "$image" =~ ^${repo//./\\.}:[0-9]{4}\.[0-9]{1,2}\.[0-9]{1,2}-(pr[0-9]+|g[0-9a-f]+)$ ]] \ || die "compose.yaml does not pin ihasmail to a dated release: ${image:-none}" ok "compose.yaml pins ihasmail to $image" running=$(docker compose --project-directory "$DEPLOY" ps -q ihasmail | xargs docker inspect --format '{{range .Config.Env}}{{println .}}{{end}}' | sed -n 's/^IHASMAIL_VERSION=//p') -- 2.54.0