Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix(e2e): avoid reloading reused kind sandbox image
Signed-off-by: Bobbins228 <[email protected]>
  • Loading branch information
Bobbins228 authored and krishicks committed Sep 23, 2026
commit d6a97927ac09a9b9affb9655656ef808f29e8520
15 changes: 11 additions & 4 deletions e2e/with-kube-gateway.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1089,6 +1089,13 @@ if [ "${OPENSHELL_E2E_KUBE_BUILD_IMAGES}" = "1" ]; then
reuse_sandbox_image=1
echo "Reusing existing sandbox image ${sandbox_image}"
fi
if [ "${SANDBOX_RUNTIME_IMAGE}" != "${sandbox_image}" ]; then
if e2e_image_reference_has_digest "${SANDBOX_RUNTIME_IMAGE}"; then
echo "ERROR: digest-pinned SANDBOX_IMAGE requires OPENSHELL_E2E_KUBE_BUILD_IMAGES=0" >&2
exit 2
fi
docker tag "${sandbox_image}" "${SANDBOX_RUNTIME_IMAGE}"
fi
if [ "${OPENSHELL_E2E_EXTERNAL_COMPUTE_DRIVER:-0}" != "1" ] \
|| ! docker image inspect "${supervisor_image}" >/dev/null 2>&1; then
CONTAINER_ENGINE=docker IMAGE_REGISTRY="${REGISTRY_VALUE}" IMAGE_TAG="${IMAGE_TAG_VALUE}" \
Expand Down Expand Up @@ -1121,17 +1128,17 @@ elif [ "${OPENSHELL_E2E_KUBE_BUILD_IMAGES}" = "1" ] \
kind_cluster_name="${KUBE_CONTEXT#kind-}"
kind_images=("${GATEWAY_IMAGE}")
# The CI workflow loads its published sandbox archive before invoking this
# wrapper. Only load a sandbox image here when this script rebuilt it.
if [ "${reuse_sandbox_image}" != "1" ]; then
kind_images+=("${REGISTRY_VALUE}/sandbox:${IMAGE_TAG_VALUE}")
# wrapper. Load a replacement only when this script rebuilt or retagged it.
if [ "${reuse_sandbox_image}" != "1" ] \
|| [ "${SANDBOX_RUNTIME_IMAGE}" != "${sandbox_image}" ]; then
kind_images+=("${SANDBOX_RUNTIME_IMAGE}")
fi
# The CI workflow loads its published supervisor archive before invoking this
# wrapper. Only load a supervisor image here when this script rebuilt it.
if [ "${reuse_supervisor_image}" != "1" ] \
|| [ "${SUPERVISOR_IMAGE}" != "${BUILD_SUPERVISOR_IMAGE}" ]; then
kind_images+=("${SUPERVISOR_IMAGE}")
fi
if docker image inspect "${SANDBOX_RUNTIME_IMAGE}" >/dev/null 2>&1; then kind_images+=("${SANDBOX_RUNTIME_IMAGE}"); fi
for image in "${kind_images[@]}"; do
echo "Loading ${image} into kind cluster ${kind_cluster_name}..."
kind load docker-image "${image}" --name "${kind_cluster_name}"
Expand Down
Loading