π OpenHands: AI-Driven Development
ci(docker): verify agent server version in image (#17544)
Zihan Xuf203f99f4542
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.ymlindex c2f69bf5b3..f56fd2633d 100644--- a/.github/workflows/docker.yml+++ b/.github/workflows/docker.yml@@ -211,6 +211,9 @@ jobs:# Boot the image before merge-manifests publishes the multi-arch tags# (including `latest`): a missing COPY only shows up at runtime (#18342).- name: Smoke test (${{ matrix.arch }})+ env:+ # An explicit agent_server_image override may ship another version.+ EXPECTED_AGENT_SERVER_VERSION: ${{ inputs.agent_server_image == '' && steps.config.outputs.agent_server_version || '' }}run: docker/smoke-test.sh "${IMAGE}@${{ steps.build.outputs.digest }}"- name: Summary (${{ matrix.arch }})diff --git a/docker/Dockerfile b/docker/Dockerfileindex 0cbbf72502..6dd79c3066 100644--- a/docker/Dockerfile+++ b/docker/Dockerfile@@ -122,9 +122,11 @@ RUN if command -v apt-get >/dev/null 2>&1; then \# Install automation server and the tool models its SDK clients deserialize.# Match openhands-tools to the SDK already provided by the agent-server image,-# just as the local Canvas launcher does.-RUN uv pip install --system "openhands-automation==${AUTOMATION_VERSION}" "openhands-tools==${AGENT_SERVER_VERSION}" 2>/dev/null \- || pip install --no-cache-dir "openhands-automation==${AUTOMATION_VERSION}" "openhands-tools==${AGENT_SERVER_VERSION}"+# just as the local Canvas launcher does. Pin openhands-agent-server too: it+# arrives via openhands-workspace, and left unpinned the resolver downgraded it+# to dodge an openai conflict (#17531).+RUN uv pip install --system "openhands-automation==${AUTOMATION_VERSION}" "openhands-tools==${AGENT_SERVER_VERSION}" "openhands-agent-server==${AGENT_SERVER_VERSION}" 2>/dev/null \+ || pip install --no-cache-dir "openhands-automation==${AUTOMATION_VERSION}" "openhands-tools==${AGENT_SERVER_VERSION}" "openhands-agent-server==${AGENT_SERVER_VERSION}"RUN if [ -n "${AGENT_SERVER_SDK_GIT_REF}" ]; then \BASE_GIT_URL="git+https://github.com/OpenHands/software-agent-sdk@${AGENT_SERVER_SDK_GIT_REF}" && \diff --git a/docker/smoke-test.sh b/docker/smoke-test.shindex 63e0f6c573..8790a65d53 100755--- a/docker/smoke-test.sh+++ b/docker/smoke-test.sh@@ -55,4 +55,22 @@ donecurl -fsS -o /dev/null --max-time 5 "$HEALTH_URL" ||fail "${HEALTH_URL} stopped answering"+# The served agent-server comes from the base image, while system Python gets+# its own copy as a dependency of openhands-workspace; a resolver conflict once+# downgraded that copy silently (#17531). Check both against the release pin.+if [ -n "${EXPECTED_AGENT_SERVER_VERSION:-}" ]; then+ served=$(docker exec "$NAME" python -c 'import json, urllib.request+print(json.load(urllib.request.urlopen("http://127.0.0.1:8000/server_info"))["version"])') ||+ fail "could not read the agent-server version from /server_info"+ installed=$(docker exec "$NAME" python -c 'from importlib.metadata import version+print(version("openhands-agent-server"))') ||+ fail "openhands-agent-server is not installed in system Python"+ echo "Agent Server: expected ${EXPECTED_AGENT_SERVER_VERSION}, served ${served}, installed ${installed}"+ [ "$served" = "$EXPECTED_AGENT_SERVER_VERSION" ] ||+ fail "serves agent-server ${served}, expected ${EXPECTED_AGENT_SERVER_VERSION}"+ [ "$installed" = "$EXPECTED_AGENT_SERVER_VERSION" ] ||+ fail "system Python has openhands-agent-server ${installed}, expected ${EXPECTED_AGENT_SERVER_VERSION}"+ docker exec "$NAME" python -m pip check || fail "pip check found broken requirements"+fi+echo "Smoke test passed for ${IMAGE}"