Skip to content
Merged
Show file tree
Hide file tree
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
ci(e2e): build matching supervisor image
  • Loading branch information
johntmyers committed May 5, 2026
commit 8be0be680f2d5722569e7f14a39949ed3b0fbe6f
7 changes: 5 additions & 2 deletions .agents/skills/debug-openshell-cluster/SKILL.md
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,11 @@ Component images (server, sandbox) can reach kubelet via two paths:
Gateway and cluster image builds consume Rust binaries staged at `deploy/docker/.build/prebuilt-binaries/<arch>/`. In CI these come from the reusable Rust native build workflow; locally `tasks/scripts/docker-build-image.sh` runs `tasks/scripts/stage-prebuilt-binaries.sh` before invoking Docker unless `PREBUILT_AUTO_STAGE=0` is set.

```bash
# Verify image refs currently used by openshell deployment
openshell doctor exec -- kubectl -n openshell get statefulset openshell -o jsonpath="{.spec.template.spec.containers[*].image}"
# Verify image refs currently used by openshell deployment.
# The gateway image and server.supervisorImage should use the same build tag
# in branch/E2E deploys; a stale supervisor image can make sandbox behavior
# lag behind gateway policy/proto changes.
openshell doctor exec -- kubectl -n openshell get statefulset openshell -o jsonpath="{.spec.template.spec.containers[*].image}{\"\n\"}{.spec.template.spec.containers[*].env[?(@.name==\"OPENSHELL_SUPERVISOR_IMAGE\")].value}{\"\n\"}"

# Verify registry mirror/auth endpoint configuration
openshell doctor exec -- cat /etc/rancher/k3s/registries.yaml
Expand Down
13 changes: 12 additions & 1 deletion .github/workflows/branch-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,19 @@ jobs:
component: cluster
platform: linux/arm64

build-supervisor:
needs: [pr_metadata]
if: needs.pr_metadata.outputs.should_run == 'true'
permissions:
contents: read
packages: write
uses: ./.github/workflows/docker-build.yml
with:
component: supervisor
platform: linux/arm64

e2e:
needs: [pr_metadata, build-gateway, build-cluster]
needs: [pr_metadata, build-gateway, build-cluster, build-supervisor]
if: needs.pr_metadata.outputs.should_run == 'true'
permissions:
contents: read
Expand Down
4 changes: 3 additions & 1 deletion deploy/docker/cluster-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -455,10 +455,12 @@ if [ -n "${PUSH_IMAGE_REFS:-}" ] && [ -f "$HELMCHART" ]; then
fi

if [ -n "${IMAGE_TAG:-}" ] && [ -f "$HELMCHART" ]; then
echo "Overriding gateway image tag to: ${IMAGE_TAG}"
echo "Overriding gateway and supervisor image tags to: ${IMAGE_TAG}"
# server image tag (standalone value field)
# Handle both quoted and unquoted defaults: tag: "latest" / tag: latest
sed -i -E "s|tag:[[:space:]]*\"?latest\"?|tag: \"${IMAGE_TAG}\"|" "$HELMCHART"
# supervisor image is a full image ref under server.supervisorImage
sed -i -E "s|(supervisorImage:[[:space:]]*\"?[^\"]*:)[^\"[:space:]]+(\"?)|\\1${IMAGE_TAG}\\2|" "$HELMCHART"
fi

if [ -f "$HELMCHART" ]; then
Expand Down
Loading