From 809d31f5b88ada4c55e7c447a224c9d0932c3d4c Mon Sep 17 00:00:00 2001 From: Lonnie Liu Date: Wed, 10 Dec 2025 19:56:48 +0000 Subject: [PATCH] [k8s test] migrate to use python 3.10 stop using python 3.9 Signed-off-by: Lonnie Liu --- .buildkite/kuberay.rayci.yml | 6 +++++- ci/docker/k8s.build.Dockerfile | 2 +- ci/docker/k8s.build.wanda.yaml | 2 +- ci/k8s/run-chaos-test.sh | 1 + ci/k8s/run-operator-tests.sh | 5 +++++ 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.buildkite/kuberay.rayci.yml b/.buildkite/kuberay.rayci.yml index 3cd811020c7f..811cc9a87c37 100644 --- a/.buildkite/kuberay.rayci.yml +++ b/.buildkite/kuberay.rayci.yml @@ -3,7 +3,7 @@ steps: - name: k8sbuild wanda: ci/docker/k8s.build.wanda.yaml depends_on: - - oss-ci-base_build + - oss-ci-base_build-multipy tags: cibase - label: ":kubernetes: operator" @@ -19,6 +19,8 @@ steps: - manylinux - forge - raycpubase + - ray-core-build + - ray-dashboard-build - label: ":kubernetes: chaos {{matrix.workload}} under {{matrix.fault}}" key: kuberay_tests @@ -45,3 +47,5 @@ steps: - manylinux - forge - raycpubase + - ray-core-build + - ray-dashboard-build diff --git a/ci/docker/k8s.build.Dockerfile b/ci/docker/k8s.build.Dockerfile index df5746d0706d..8765c6c9f00d 100644 --- a/ci/docker/k8s.build.Dockerfile +++ b/ci/docker/k8s.build.Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1.3-labs -FROM cr.ray.io/rayproject/oss-ci-base_build +FROM cr.ray.io/rayproject/oss-ci-base_build-py3.10 SHELL ["/bin/bash", "-ice"] diff --git a/ci/docker/k8s.build.wanda.yaml b/ci/docker/k8s.build.wanda.yaml index dc4f1227a6cc..dbf4ec0cf6a9 100644 --- a/ci/docker/k8s.build.wanda.yaml +++ b/ci/docker/k8s.build.wanda.yaml @@ -1,5 +1,5 @@ name: k8sbuild -froms: ["cr.ray.io/rayproject/oss-ci-base_build"] +froms: ["cr.ray.io/rayproject/oss-ci-base_build-py3.10"] dockerfile: ci/docker/k8s.build.Dockerfile srcs: - python/requirements.txt diff --git a/ci/k8s/run-chaos-test.sh b/ci/k8s/run-chaos-test.sh index f3be4848ad08..6faae5a4c63c 100644 --- a/ci/k8s/run-chaos-test.sh +++ b/ci/k8s/run-chaos-test.sh @@ -6,6 +6,7 @@ CHAOS_FAULT="${1:-no_fault}" CHAOS_WORKLOAD="${2:-test_potato_passer}" bazel run //ci/ray_ci:build_in_docker -- docker \ + --python-version 3.10 \ --platform cpu --canonical-tag kuberay-test docker tag rayproject/ray:kuberay-test ray-ci:kuberay-test diff --git a/ci/k8s/run-operator-tests.sh b/ci/k8s/run-operator-tests.sh index c206985deaf3..faccad315ea3 100644 --- a/ci/k8s/run-operator-tests.sh +++ b/ci/k8s/run-operator-tests.sh @@ -4,8 +4,11 @@ set -euo pipefail # TODO(aslonnie): refactor this test to be hermetic. +PYTHON_VERSION=3.10 + echo "--- Build image" bazel run //ci/ray_ci:build_in_docker -- docker \ + --python-version "$PYTHON_VERSION" \ --platform cpu --canonical-tag kuberay-test docker tag rayproject/ray:kuberay-test ray-ci:kuberay-test @@ -49,6 +52,7 @@ bazel run //ci/ray_ci:test_in_docker -- //python/ray/tests/... kuberay \ --test-env=RAY_IMAGE=docker.io/library/ray-ci:kuberay-test \ --test-env=PULL_POLICY=Never \ --test-env=KUBECONFIG=/tmp/rayci-kubeconfig \ + --python-version "$PYTHON_VERSION" \ "--test-env=KUBECONFIG_BASE64=$(base64 -w0 "$HOME/.kube/config")" # Test for autoscaler v2. @@ -59,4 +63,5 @@ bazel run //ci/ray_ci:test_in_docker -- //python/ray/tests/... kuberay \ --test-env=PULL_POLICY=Never \ --test-env=AUTOSCALER_V2=True \ --test-env=KUBECONFIG=/tmp/rayci-kubeconfig \ + --python-version "$PYTHON_VERSION" \ "--test-env=KUBECONFIG_BASE64=$(base64 -w0 "$HOME/.kube/config")"