Merge branch 'master' into master

Author: am-kinetica

.buildkite/_images.rayci.yml

@@ -115,10 +115,6 @@ steps:
         - "3.12"
       cuda:
         - "13.0.0-cudnn"
-      adjustments:
-        - with:
-            python: "3.11"
-            cuda: "12.8.1-cudnn"
     env:
       PYTHON_VERSION: "{{array.python}}"
       CUDA_VERSION: "{{array.cuda}}"
@@ -131,10 +127,6 @@ steps:
         - "3.12"
       cuda:
         - "13.0.0-cudnn"
-      adjustments:
-        - with:
-            python: "3.11"
-            cuda: "12.8.1-cudnn"
     env:
       PYTHON_VERSION: "{{array.python}}"
       CUDA_VERSION: "{{array.cuda}}"

.buildkite/build.rayci.yml

@@ -271,10 +271,6 @@ steps:
         - "3.12"
       cuda:
         - "13.0.0-cudnn"
-      adjustments:
-        - with:
-            python: "3.11"
-            cuda: "12.8.1-cudnn"
     env_file: rayci.env
     env:
       PYTHON_VERSION: "{{array.python}}"
@@ -296,10 +292,6 @@ steps:
         - "3.12"
       cuda:
         - "13.0.0-cudnn"
-      adjustments:
-        - with:
-            python: "3.11"
-            cuda: "12.8.1-cudnn"
     env_file: rayci.env
     env:
       PYTHON_VERSION: "{{array.python}}"
@@ -362,10 +354,6 @@ steps:
         - "3.12"
       platform:
         - cu13.0.0-cudnn
-      adjustments:
-        - with:
-            python: "3.11"
-            platform: "cu12.8.1-cudnn"
     depends_on:
       - ray-llm-image-cuda-build($)
     tags:
@@ -389,10 +377,6 @@ steps:
         - "3.12"
       platform:
         - cu13.0.0-cudnn
-      adjustments:
-        - with:
-            python: "3.11"
-            platform: "cu12.8.1-cudnn"
     depends_on:
       - ray-llm-extra-image-cuda-build($)
     tags:

.buildkite/data.rayci.yml

@@ -40,13 +40,6 @@ steps:
       PYTHON: "3.10"
     tags: cibase
 
-  - name: datatfxbslbuild-multipy
-    label: "wanda: datatfxbslbuild-py3.11"
-    wanda: ci/docker/datatfxbsl.build.wanda.yaml
-    env:
-      PYTHON: "3.11"
-    tags: cibase
-
   - name: datatfdsbuild-multipy
     label: "wanda: datatfdsbuild-py3.12"
     wanda: ci/docker/datatfds.build.wanda.yaml
@@ -239,16 +232,6 @@ steps:
         --only-tags dask
     depends_on: datalbuild-multipy(python=3.12)
 
-  - label: ":database: data: TFRecords (tfx-bsl) tests"
-    tags:
-      - data
-    instance_type: medium
-    commands:
-      - bazel run //ci/ray_ci:test_in_docker -- //python/ray/data/... data
-        --build-name datatfxbslbuild-py3.11 --python-version 3.11
-        --only-tags tfxbsl
-    depends_on: datatfxbslbuild-multipy
-
   - label: ":database: data: doc tests"
     tags:
       - data

.buildkite/llm.rayci.yml

@@ -5,46 +5,24 @@ depends_on:
   - ray-dashboard-build
 steps:
   - name: llmbuild
-    wanda: ci/docker/llm.build.wanda.yaml
-    depends_on:
-      - oss-ci-base_build-multipy(python=3.11)
-    env:
-      PYTHON: "3.11"
-      BASE_TYPE: "build"
-      BUILD_VARIANT: "build"
-      RAY_CUDA_CODE: "cpu"
-    tags: cibase
-
-  - name: llmbuild-py312
     wanda: ci/docker/llm.build.wanda.yaml
     depends_on:
       - oss-ci-base_build-multipy(python=3.12)
     env:
       PYTHON: "3.12"
       BASE_TYPE: "build"
-      BUILD_VARIANT: "build-py312"
+      BUILD_VARIANT: "build"
       RAY_CUDA_CODE: "cpu"
     tags: cibase
 
   - name: llmgpubuild
-    wanda: ci/docker/llm.build.wanda.yaml
-    depends_on:
-      - oss-ci-base_cu128-multipy
-    env:
-      PYTHON: "3.11"
-      BASE_TYPE: "cu128"
-      BUILD_VARIANT: "gpubuild"
-      RAY_CUDA_CODE: "cu128"
-    tags: cibase
-
-  - name: llmgpubuild-py312
     wanda: ci/docker/llm.build.wanda.yaml
     depends_on:
       - oss-ci-base_cu130-multipy(python=3.12)
     env:
       PYTHON: "3.12"
       BASE_TYPE: "cu130"
-      BUILD_VARIANT: "gpubuild-py312"
+      BUILD_VARIANT: "gpubuild"
       RAY_CUDA_CODE: "cu130"
     tags: cibase
 
@@ -57,9 +35,9 @@ steps:
     instance_type: medium
     commands:
       - bazel run //ci/ray_ci:test_in_docker -- //python/ray/llm/... //doc/... llm
-        --python-version 3.12 --build-name llmbuild-py312
+        --python-version 3.12 --build-name llmbuild
         --except-tags gpu
-    depends_on: llmbuild-py312
+    depends_on: llmbuild
 
   - label: "llm gpu tests"
     key: "llm-gpu-tests"
@@ -69,9 +47,9 @@ steps:
     instance_type: g6-large
     commands:
       - RAYCI_DISABLE_TEST_DB=1 bazel run //ci/ray_ci:test_in_docker -- //python/ray/llm/... //doc/... llm
-        --python-version 3.12 --build-name llmgpubuild-py312 --only-tags gpu
+        --python-version 3.12 --build-name llmgpubuild --only-tags gpu
         --except-tags multi_gpu_4
-    depends_on: llmgpubuild-py312
+    depends_on: llmgpubuild
 
   - label: "llm gpu tests (4 GPUs)"
     key: "llm-gpu-tests-4gpu"
@@ -81,7 +59,7 @@ steps:
     instance_type: gpu-large
     commands:
       - RAYCI_DISABLE_TEST_DB=1 bazel run //ci/ray_ci:test_in_docker -- //doc/... llm
-        --python-version 3.12 --build-name llmgpubuild-py312
+        --python-version 3.12 --build-name llmgpubuild
         --only-tags multi_gpu_4
         --gpus 4
-    depends_on: llmgpubuild-py312
+    depends_on: llmgpubuild

.buildkite/release/build.rayci.yml

@@ -45,10 +45,6 @@ steps:
         - "3.12"
       cuda:
         - "13.0.0-cudnn"
-      adjustments:
-        - with:
-            python: "3.11"
-            cuda: "12.8.1-cudnn"
     env:
       PYTHON_VERSION: "{{array.python}}"
       CUDA_VERSION: "{{array.cuda}}"
@@ -179,10 +175,6 @@ steps:
         - "cu13.0.0-cudnn"
       python:
         - "3.12"
-      adjustments:
-        - with:
-            python: "3.11"
-            gpu: "cu12.8.1-cudnn"
     env:
       PYTHON_VERSION: "{{array.python}}"
       GPU: "{{array.gpu}}"
@@ -213,10 +205,6 @@ steps:
         - cu13.0.0-cudnn
       python:
         - "3.12"
-      adjustments:
-        - with:
-            python: "3.11"
-            gpu: "cu12.8.1-cudnn"
 
   - name: ray-ml-anyscale-cuda-build
     label: "wanda: ray-ml-anyscale py{{array.python}} {{array.gpu}}"

.buildkite/serve.rayci.yml

@@ -224,13 +224,14 @@ steps:
       - python
     instance_type: large
     commands:
+      # Exit 42 skips whole-step retry (per @kouroshHakha); per-test retry is enough.
       - bazel run //ci/ray_ci:test_in_docker -- $(cat ci/ray_ci/serve_hap_test_names.txt) serve
         --workers "$${BUILDKITE_PARALLEL_JOB_COUNT}" --worker-id "$${BUILDKITE_PARALLEL_JOB}"
         --build-name servebuild-py3.10 --python-version 3.10
         --test-env=RAY_SERVE_ENABLE_HA_PROXY=1
         --test-env=RAY_SERVE_ENABLE_DIRECT_INGRESS=0
         --test-env=RAY_SERVE_DIRECT_INGRESS_MIN_DRAINING_PERIOD_S=0.01
-        --test-env=SERVE_SOCKET_REUSE_PORT_ENABLED=1
+        --test-env=SERVE_SOCKET_REUSE_PORT_ENABLED=1 || exit 42
     depends_on: servebuild-multipy(python=3.10)
 
   - label: ":ray-serve: serve: HAProxy tests (pip)"
@@ -240,14 +241,15 @@ steps:
       - python
     instance_type: large
     commands:
+      # Exit 42 skips whole-step retry (per @kouroshHakha); per-test retry is enough.
       - bazel run //ci/ray_ci:test_in_docker -- $(cat ci/ray_ci/serve_hap_test_names.txt) serve
         --workers "$${BUILDKITE_PARALLEL_JOB_COUNT}" --worker-id "$${BUILDKITE_PARALLEL_JOB}"
         --build-name servebuild-py3.10 --python-version 3.10
         --test-env=RAY_SERVE_ENABLE_HA_PROXY=1
         --test-env=RAY_SERVE_EXPERIMENTAL_PIP_HAPROXY=1
         --test-env=RAY_SERVE_ENABLE_DIRECT_INGRESS=0
         --test-env=RAY_SERVE_DIRECT_INGRESS_MIN_DRAINING_PERIOD_S=0.01
-        --test-env=SERVE_SOCKET_REUSE_PORT_ENABLED=1
+        --test-env=SERVE_SOCKET_REUSE_PORT_ENABLED=1 || exit 42
     depends_on: servebuild-multipy(python=3.10)
 
   - label: ":ray-serve: serve: direct ingress tests"

.claude/skills/fetch-buildkite-logs/SKILL.md

@@ -6,22 +6,49 @@ description: Fetch and analyze Buildkite CI build logs for failures
 # Fetch Buildkite Logs
 
 ## Prerequisites
-- BUILDKITE_API_TOKEN must be set in the environment (typically ~/.bashrc)
-- If not configured, direct user to doc/source/ray-contribute/agent-development.md for setup
+- `BUILDKITE_API_TOKEN` must be set in the environment (typically `~/.bashrc`)
+- If not configured, direct user to `doc/source/ray-contribute/agent-development.md` for setup
+
+## Parsing the Buildkite URL
+
+A Buildkite URL has the form:
+
+```
+https://buildkite.com/ray-project/<PIPELINE>/builds/<BUILD_NUM>#<JOB_ID>
+```
+
+Always extract `<PIPELINE>` (e.g. `premerge`, `postmerge`) and `<BUILD_NUM>` from the URL the user provides. **Do not hardcode `premerge`** — the same skill is used for all pipelines. If a `#<JOB_ID>` fragment is present, it identifies a specific real job (not a group/wait job) and can be queried directly.
 
 ## Steps
+
 1. Verify token: `echo $BUILDKITE_API_TOKEN | head -c4`
 2. If token missing, stop and show setup instructions from the dev docs
-3. Fetch build:
+3. Fetch build (use the pipeline from the URL):
    ```bash
    curl -s -H "Authorization: Bearer $BUILDKITE_API_TOKEN" \
-     "https://api.buildkite.com/v2/organizations/ray-project/pipelines/premerge/builds/<BUILD_NUM>"
+     "https://api.buildkite.com/v2/organizations/ray-project/pipelines/<PIPELINE>/builds/<BUILD_NUM>"
    ```
-4. List failed jobs:
+4. If a job ID is present in the URL fragment, look it up directly:
    ```bash
    curl -s -H "Authorization: Bearer $BUILDKITE_API_TOKEN" \
-     "https://api.buildkite.com/v2/organizations/ray-project/pipelines/premerge/builds/<BUILD_NUM>" \
+     "https://api.buildkite.com/v2/organizations/ray-project/pipelines/<PIPELINE>/builds/<BUILD_NUM>" \
+     | python3 -c "import sys,json; jobs=json.load(sys.stdin)['jobs']; [print(f\"{j['id']} {j.get('name')} -> {j.get('state')}\") for j in jobs if j['id']=='<JOB_ID>']"
+   ```
+5. Otherwise list failed/broken jobs:
+   ```bash
+   curl -s -H "Authorization: Bearer $BUILDKITE_API_TOKEN" \
+     "https://api.buildkite.com/v2/organizations/ray-project/pipelines/<PIPELINE>/builds/<BUILD_NUM>" \
      | python3 -c "import sys,json; jobs=json.load(sys.stdin)['jobs']; [print(f\"{j['id']} {j['name']} -> {j['state']}\") for j in jobs if j.get('state') in ('failed','broken')]"
    ```
-5. Fetch individual job logs and analyze root causes
-6. Summarize failures and suggest fixes
+6. Fetch individual job log:
+   ```bash
+   curl -s -H "Authorization: Bearer $BUILDKITE_API_TOKEN" \
+     "https://api.buildkite.com/v2/organizations/ray-project/pipelines/<PIPELINE>/builds/<BUILD_NUM>/jobs/<JOB_ID>/log" \
+     > /tmp/log_<JOB_ID>.json
+   ```
+   Logs come back as JSON with a `content` field containing ANSI escape codes — strip them with `re.sub(r'\x1b\[[0-9;]*m', '', content)` before grepping.
+7. Summarize failures and suggest fixes.
+
+## Authentication note
+
+If `curl` returns `{"message":"No organization found"}`, the configured token does not have access to `ray-project`. The user may have a separate org-scoped token — ask them which env var to source.

.vale/styles/config/vocabularies/Data/accept.txt

@@ -56,3 +56,5 @@ YOLO
 [Ss]harded
 [Pp]arameterization(s)?
 repr
+[Uu]psample(d|s)?
+[Rr]ebatch(ing|ed|es)?