Skip to content

Commit

Permalink
Revert "[release] Update Ray image to 2.34.0 (#2303)" (#2413)
Browse files Browse the repository at this point in the history
This reverts commit 678ec25.
  • Loading branch information
kevin85421 committed Sep 29, 2024
1 parent 99505a5 commit d8ffec4
Show file tree
Hide file tree
Showing 86 changed files with 303 additions and 307 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/test-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -319,13 +319,13 @@ jobs:
run: go test ./pkg/... -race -parallel 4
working-directory: ${{env.working-directory}}

test-compatibility-2_8_0:
test-compatibility-2_7_0:
needs:
- build_operator
- build_apiserver
- lint
runs-on: ubuntu-latest
name: Compatibility Test - 2.8.0
name: Compatibility Test - 2.7.0
steps:
- name: Check out code into the Go module directory
uses: actions/checkout@v2
Expand All @@ -337,15 +337,15 @@ jobs:

- uses: ./.github/workflows/actions/compatibility
with:
ray_version: 2.8.0
ray_version: 2.7.0

test-compatibility-2_9_0:
test-compatibility-2_8_0:
needs:
- build_operator
- build_apiserver
- lint
runs-on: ubuntu-latest
name: Compatibility Test - 2.9.0
name: Compatibility Test - 2.8.0
steps:
- name: Check out code into the Go module directory
uses: actions/checkout@v2
Expand All @@ -357,15 +357,15 @@ jobs:

- uses: ./.github/workflows/actions/compatibility
with:
ray_version: 2.9.0
ray_version: 2.8.0

test-compatibility-2_34_0:
test-compatibility-2_9_0:
needs:
- build_operator
- build_apiserver
- lint
runs-on: ubuntu-latest
name: Compatibility Test - 2.34.0
name: Compatibility Test - 2.9.0
steps:
- name: Check out code into the Go module directory
uses: actions/checkout@v2
Expand All @@ -377,7 +377,7 @@ jobs:

- uses: ./.github/workflows/actions/compatibility
with:
ray_version: 2.34.0
ray_version: 2.9.0

test-compatibility-nightly:
needs:
Expand Down
4 changes: 2 additions & 2 deletions apiserver/Autoscaling.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ curl -X POST 'localhost:31888/apis/v1/namespaces/default/clusters' \
},
"headGroupSpec": {
"computeTemplate": "default-template",
"image": "rayproject/ray:2.34.0-py310",
"image": "rayproject/ray:2.9.0-py310",
"serviceType": "NodePort",
"rayStartParams": {
"dashboard-host": "0.0.0.0",
Expand All @@ -71,7 +71,7 @@ curl -X POST 'localhost:31888/apis/v1/namespaces/default/clusters' \
{
"groupName": "small-wg",
"computeTemplate": "default-template",
"image": "rayproject/ray:2.34.0-py310",
"image": "rayproject/ray:2.9.0-py310",
"replicas": 0,
"minReplicas": 0,
"maxReplicas": 5,
Expand Down
4 changes: 2 additions & 2 deletions apiserver/CreatingServe.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ curl -X POST 'localhost:31888/apis/v1/namespaces/default/clusters' \
"clusterSpec": {
"headGroupSpec": {
"computeTemplate": "default-template",
"image": "rayproject/ray:2.34.0-py310",
"image": "rayproject/ray:2.9.0-py310",
"serviceType": "ClusterIP",
"rayStartParams": {
"dashboard-host": "0.0.0.0",
Expand All @@ -44,7 +44,7 @@ curl -X POST 'localhost:31888/apis/v1/namespaces/default/clusters' \
{
"groupName": "small-wg",
"computeTemplate": "default-template",
"image": "rayproject/ray:2.34.0-py310",
"image": "rayproject/ray:2.9.0-py310",
"replicas": 1,
"minReplicas": 0,
"maxReplicas": 5,
Expand Down
2 changes: 1 addition & 1 deletion apiserver/DEVELOPMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ There are two `make` targets provide execute the end to end test (integration be

The `e2e` test targets use two variables to control what version of Ray images to use in the end to end tests:

* `E2E_API_SERVER_RAY_IMAGE` -- for the ray docker image. Currently set to `rayproject/ray:2.34.0-py310`. On Apple silicon or arm64 development machines the `-aarch64` suffix is added to the image.
* `E2E_API_SERVER_RAY_IMAGE` -- for the ray docker image. Currently set to `rayproject/ray:2.9.0-py310`. On Apple silicon or arm64 development machines the `-aarch64` suffix is added to the image.
* `E2E_API_SERVER_URL` -- for the base URL of the deployed KubeRayAPI server. The default value is: `http://localhost:31888`

The end to end test targets share the usage of the `GO_TEST_FLAGS`. Overriding the make file variable with a `-v` option allows for both unit and end to end tests to print any output / debug messages. By default, only if there's a test failure those messages are shown.
Expand Down
6 changes: 3 additions & 3 deletions apiserver/HACluster.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,15 @@ curl -X POST 'localhost:31888/apis/v1/namespaces/default/clusters' \
"name": "ha-cluster",
"namespace": "default",
"user": "boris",
"version": "2.34.0",
"version": "2.9.0",
"environment": "DEV",
"annotations" : {
"ray.io/ft-enabled": "true"
},
"clusterSpec": {
"headGroupSpec": {
"computeTemplate": "default-template",
"image": "rayproject/ray:2.34.0-py310",
"image": "rayproject/ray:2.9.0-py310",
"serviceType": "NodePort",
"rayStartParams": {
"dashboard-host": "0.0.0.0",
Expand Down Expand Up @@ -103,7 +103,7 @@ curl -X POST 'localhost:31888/apis/v1/namespaces/default/clusters' \
{
"groupName": "small-wg",
"computeTemplate": "default-template",
"image": "rayproject/ray:2.34.0-py310",
"image": "rayproject/ray:2.9.0-py310",
"replicas": 1,
"minReplicas": 0,
"maxReplicas": 5,
Expand Down
4 changes: 2 additions & 2 deletions apiserver/JobSubmission.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ curl -X POST 'localhost:31888/apis/v1/namespaces/default/clusters' \
"clusterSpec": {
"headGroupSpec": {
"computeTemplate": "default-template",
"image": "rayproject/ray:2.34.0-py310",
"image": "rayproject/ray:2.9.0-py310",
"serviceType": "NodePort",
"rayStartParams": {
"dashboard-host": "0.0.0.0",
Expand All @@ -60,7 +60,7 @@ curl -X POST 'localhost:31888/apis/v1/namespaces/default/clusters' \
{
"groupName": "small-wg",
"computeTemplate": "default-template",
"image": "rayproject/ray:2.34.0-py310",
"image": "rayproject/ray:2.9.0-py310",
"replicas": 1,
"minReplicas": 1,
"maxReplicas": 1,
Expand Down
4 changes: 2 additions & 2 deletions apiserver/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ GO_TEST_FLAGS ?=
# Ray docker images to use for end to end tests based upon the architecture
# for arm64 environments (Apple silicon included) pull the architecture specific image
ifeq (arm64,$(shell go env GOARCH))
E2E_API_SERVER_RAY_IMAGE ?=rayproject/ray:2.34.0-py310-aarch64
E2E_API_SERVER_RAY_IMAGE ?=rayproject/ray:2.9.0-py310-aarch64
else
E2E_API_SERVER_RAY_IMAGE ?=rayproject/ray:2.34.0-py310
E2E_API_SERVER_RAY_IMAGE ?=rayproject/ray:2.9.0-py310
endif
# Kuberay API Server base URL to use in end to end tests
E2E_API_SERVER_URL ?=http://localhost:31888
Expand Down
Loading

0 comments on commit d8ffec4

Please sign in to comment.