Files
Stefan WangandGitHub 1466289a1b [apiserver][test] Trust E2E_API_SERVER_RAY_IMAGE verbatim (closes #4346) (#4770)
* [apiserver][test] Trust E2E_API_SERVER_RAY_IMAGE verbatim

The apiserver e2e helpers `withRayImage` in `apiserver/test/e2e/types.go`
and `apiserver/test/e2e/apiserversdk/types.go` second-guess the configured
image: when `runtime.GOARCH == "arm64"` they auto-append `-aarch64`. This
prevents Apple-silicon developers from running the suite against an
x86_64-only remote cluster, even when they explicitly set
`E2E_API_SERVER_RAY_IMAGE` to an x86_64 image.

PR #4348 already removed the same pattern from
`ray-operator/test/support/environment.go`. This change applies the same
cleanup to the two remaining occurrences, completing #4346.

`apiserver/Makefile:14-16` already provides the correct arm64-suffixed
default for arm64 hosts via `ifeq (arm64, $(shell go env GOARCH))`, so
`make test` behavior on arm64 is preserved.

Signed-off-by: 1fanwang <[email protected]>

* [apiserver][test][make] Export E2E_API_SERVER_{RAY_IMAGE,URL}

Without `export`, Make-defined defaults don't propagate to the `go test`
subprocess in `e2e-test`, so the e2e helpers fall back to their hard-coded
defaults. On arm64 hosts running `make local-e2e-test`, this caused
`load-ray-test-image` to preload `rayproject/ray:2.46.0-py310-aarch64`
into kind while the Go test would (post the previous commit) ask for
`rayproject/ray:2.46.0-py310` — a mismatch caught by Cursor Bugbot in the
PR review.

Exporting both vars makes the Makefile the single source of truth for the
target image and base URL, restoring the on-arm64 behavior that the in-Go
GOARCH detection used to mask.

Signed-off-by: 1fanwang <[email protected]>

---------

Signed-off-by: 1fanwang <[email protected]>
2026-05-17 23:34:08 +08:00
..