From b1c911cf692a932dea2682f90ad267180c1f23f3 Mon Sep 17 00:00:00 2001 From: Steven Miller Date: Wed, 8 Jul 2026 14:18:55 -0400 Subject: [PATCH] Pin Redis image for entrypoint env tests --- cmd/test-prewarm/main.go | 3 ++- lib/instances/manager_test.go | 6 ++++-- lib/instances/qemu_test.go | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/cmd/test-prewarm/main.go b/cmd/test-prewarm/main.go index 2be4ba46..23601987 100644 --- a/cmd/test-prewarm/main.go +++ b/cmd/test-prewarm/main.go @@ -40,7 +40,8 @@ var defaultImages = []prewarmImage{ {Source: "docker.io/library/alpine:3.18"}, {Source: "docker.io/library/debian:12-slim"}, {Source: "docker.io/library/nginx:alpine"}, - {Source: "docker.io/bitnami/redis:latest"}, + // Keep in sync with redisEntrypointEnvImage in lib/instances tests. + {Source: "docker.io/bitnamilegacy/redis:7.2.5-debian-12-r0"}, {Source: "docker.io/jrei/systemd-ubuntu:22.04"}, // amd64-only mirror for the Rosetta x86 image E2E (single-platform manifest; // see toLocalRegistryRef for why it must be the only mirror of this tag). diff --git a/lib/instances/manager_test.go b/lib/instances/manager_test.go index 49a1f80b..89f47482 100644 --- a/lib/instances/manager_test.go +++ b/lib/instances/manager_test.go @@ -1159,6 +1159,8 @@ func TestOOMExitPropagation(t *testing.T) { t.Skipf("OOM did not trigger reliably on this host after %d attempts (last observed state: %s)", retries, lastObservedState) } +const redisEntrypointEnvImage = "docker.io/bitnamilegacy/redis:7.2.5-debian-12-r0" + // TestEntrypointEnvVars verifies that environment variables are passed to the entrypoint process. // This uses bitnami/redis which configures REDIS_PASSWORD from an env var - if auth is required, // it proves the entrypoint received and used the env var. @@ -1180,7 +1182,7 @@ func TestEntrypointEnvVars(t *testing.T) { // Pull bitnami/redis image t.Log("Pulling bitnami/redis image...") redisImage, err := imageManager.CreateImage(ctx, images.CreateImageRequest{ - Name: integrationTestImageRef(t, "docker.io/bitnami/redis:latest"), + Name: integrationTestImageRef(t, redisEntrypointEnvImage), }) require.NoError(t, err) @@ -1218,7 +1220,7 @@ func TestEntrypointEnvVars(t *testing.T) { testPassword := "test_secret_password_123" req := CreateInstanceRequest{ Name: "test-redis-env", - Image: integrationTestImageRef(t, "docker.io/bitnami/redis:latest"), + Image: integrationTestImageRef(t, redisEntrypointEnvImage), Size: 2 * 1024 * 1024 * 1024, HotplugSize: 512 * 1024 * 1024, OverlaySize: 10 * 1024 * 1024 * 1024, diff --git a/lib/instances/qemu_test.go b/lib/instances/qemu_test.go index e811a55c..927c7364 100644 --- a/lib/instances/qemu_test.go +++ b/lib/instances/qemu_test.go @@ -606,7 +606,7 @@ func TestQEMUEntrypointEnvVars(t *testing.T) { // Pull bitnami/redis image t.Log("Pulling bitnami/redis image...") redisImage, err := imageManager.CreateImage(ctx, images.CreateImageRequest{ - Name: integrationTestImageRef(t, "docker.io/bitnami/redis:latest"), + Name: integrationTestImageRef(t, redisEntrypointEnvImage), }) require.NoError(t, err) @@ -648,7 +648,7 @@ func TestQEMUEntrypointEnvVars(t *testing.T) { testPassword := "test_secret_password_123" req := CreateInstanceRequest{ Name: "test-redis-env", - Image: integrationTestImageRef(t, "docker.io/bitnami/redis:latest"), + Image: integrationTestImageRef(t, redisEntrypointEnvImage), Size: 2 * 1024 * 1024 * 1024, HotplugSize: 512 * 1024 * 1024, OverlaySize: 10 * 1024 * 1024 * 1024,