Cleans up duplicative deps change check

Signed-off-by: dougbtv <dosmith@redhat.com>

Author: dougbtv

buildkite/bootstrap.sh

@@ -164,9 +164,9 @@ ignore_patterns=(
     "cmake/hipify.py"
     "cmake/cpu_extension.cmake"
 )
-
+# Detect if there are critical changes matching patterns
+CRITICAL_CHANGE_DETECTED=0
 for file in $file_diff; do
-    # First check if file matches any pattern
     matches_pattern=0
     for pattern in "${patterns[@]}"; do
         if [[ $file == $pattern* ]] || [[ $file == $pattern ]]; then
@@ -175,7 +175,6 @@ for file in $file_diff; do
         fi
     done
 
-    # If file matches pattern, check it's not in ignore patterns
     if [[ $matches_pattern -eq 1 ]]; then
         matches_ignore=0
         for ignore in "${ignore_patterns[@]}"; do
@@ -186,41 +185,46 @@ for file in $file_diff; do
         done
 
         if [[ $matches_ignore -eq 0 ]]; then
-            RUN_ALL=1
-            echo "Found changes: $file. Run all tests"
+            CRITICAL_CHANGE_DETECTED=1
+            echo "Found critical changes: $file"
             break
         fi
     fi
 done
 
+# RUN_ALL can be set manually, but also set it when critical changes are detected
+if [[ -z "${RUN_ALL:-}" ]]; then
+    RUN_ALL=0
+fi
+if [[ $CRITICAL_CHANGE_DETECTED -eq 1 ]]; then
+    RUN_ALL=1
+    echo "RUN_ALL set due to critical changes"
+fi
+
 # Decide whether to use precompiled wheels
-# Relies on existing patterns array as a basis.
 if [[ -n "${VLLM_USE_PRECOMPILED:-}" ]]; then
     echo "VLLM_USE_PRECOMPILED is already set to: $VLLM_USE_PRECOMPILED"
-elif [[ $RUN_ALL -eq 1 || "${BUILDKITE_BRANCH}" == "main" ]]; then
+elif [[ $CRITICAL_CHANGE_DETECTED -eq 1 || "${BUILDKITE_BRANCH}" == "main" ]]; then
     export VLLM_USE_PRECOMPILED=0
-    echo "Detected critical changes, building wheels from source"
+    echo "Detected critical changes or main branch, building wheels from source"
 else
     export VLLM_USE_PRECOMPILED=1
     echo "No critical changes, using precompiled wheels"
 fi
 
 # Decide whether to skip building docker images (pull & mount code instead)
-# Honor manual override if provided.
 if [[ -n "${SKIP_IMAGE_BUILD:-}" ]]; then
     echo "SKIP_IMAGE_BUILD is preset to: ${SKIP_IMAGE_BUILD}"
 else
-    # Auto decision:
-    # - No critical changes (RUN_ALL==0)
-    # - VLLM_USE_PRECOMPILED==1
-    if [[ "${VLLM_USE_PRECOMPILED:-}" == "1" && "$RUN_ALL" -eq 0 ]]; then
+    if [[ "${VLLM_USE_PRECOMPILED:-}" == "1" && "$CRITICAL_CHANGE_DETECTED" -eq 0 ]]; then
         SKIP_IMAGE_BUILD=1
     else
         SKIP_IMAGE_BUILD=0
     fi
 fi
 
 # Determine the lowest common ancestor (LCA) commit with main branch if skipping image build
+DOCKER_IMAGE_OVERRIDE=""
 if [[ "${SKIP_IMAGE_BUILD}" == "1" ]]; then
     LCA_COMMIT=""
     if git rev-parse --is-inside-work-tree >/dev/null 2>&1; then

buildkite/test-template-ci.j2

@@ -37,11 +37,16 @@
 {%- set tests_only = (tests_acc.only_tests and tests_acc.any) %}
 {%- set changed_tests = tests_acc.changed %}
 
-{% macro vllm_checkoutoverlay_script(step,default_working_dir,skip_image_build,fail_fast,cov_enabled) -%}
-set {% if fail_fast == "true" %}-xeuo pipefail{% else %}-xuo{% endif %}
+{% macro vllm_checkoutoverlay_script(step, default_working_dir, skip_image_build, fail_fast, cov_enabled) %}
+{% if fail_fast == "true" -%}
+set -xeuo pipefail
+{%- else -%}
+set -xuo pipefail
+{%- endif %}
+
 echo "SKIP_IMAGE_BUILD={{ skip_image_build }}"
-{% if skip_image_build == "1" %}
 
+{% if skip_image_build == "1" %}
 # Copy in the code from the checkout to the workspace
 rm -rf /vllm-workspace/vllm || true
 cp -a /workdir/. /vllm-workspace/
@@ -54,6 +59,7 @@ cp -a /vllm-workspace/vllm/* "$$SITEPKG/vllm/"
 rm -rf /vllm-workspace/src || true
 mkdir -p /vllm-workspace/src
 mv /vllm-workspace/vllm /vllm-workspace/src/vllm
+{% endif %}
 
 (command -v nvidia-smi >/dev/null && nvidia-smi || true)
 export VLLM_LOGGING_LEVEL=DEBUG
@@ -62,13 +68,6 @@ cd {{ (step.working_dir or default_working_dir) | safe }}
 
 # Run tests with intelligent targeting and coverage
 {{ add_docker_pytest_coverage(step, cov_enabled) }}
-{%- endmacro %}
-{% macro add_pytest_coverage(cmd, coverage_file) %}
-{% if "pytest " in cmd %}
-COVERAGE_FILE={{ coverage_file }} {{ cmd | replace("pytest ", "pytest --cov=vllm --cov-report=xml --cov-append --durations=0 ") }} || true
-{% else %}
-{{ cmd }}
-{% endif %}
 {% endmacro %}
 
 {% macro add_docker_pytest_coverage(step, cov_enabled) %}
@@ -197,7 +196,6 @@ plugins:
       volumes:
         - /dev/shm:/dev/shm
         - {{ hf_home_fsx }}:{{ hf_home_fsx }}
-        - $PWD:/workdir
   {% elif step.gpu == "h200" %}
    - docker#v5.2.0:
       image: {{ image }}
@@ -225,7 +223,6 @@ plugins:
         - /dev/shm:/dev/shm
         - /data/benchmark-hf-cache:/benchmark-hf-cache
         - /data/benchmark-vllm-cache:/root/.cache/vllm
-        - $PWD:/workdir
   {% elif step.gpu == "b200" %}
    - docker#v5.2.0:
       image: {{ image }}
@@ -254,7 +251,6 @@ plugins:
         - /dev/shm:/dev/shm
         - /data/benchmark-hf-cache:/benchmark-hf-cache
         - /data/benchmark-vllm-cache:/root/.cache/vllm
-        - $PWD:/workdir
   {% else %}
   - kubernetes:
       podSpec:

buildkite/test-template-fastcheck.j2

@@ -10,9 +10,9 @@
 {% set hf_home_efs = "/mnt/efs/hf_cache" %}
 {% set hf_home_fsx = "/fsx/hf_cache" %}
 
-{% macro vllm_checkoutoverlay_script(step,default_working_dir,skip_image_build,requirements_changed,fail_fast) -%}
+{% macro vllm_checkoutoverlay_script(step,default_working_dir,skip_image_build,fail_fast) -%}
 set {% if fail_fast == "true" %}-xeuo pipefail{% else %}-xuo{% endif %}
-echo "SKIP_IMAGE_BUILD={{ skip_image_build }} REQUIREMENTS_CHANGED={{ requirements_changed }}"
+echo "SKIP_IMAGE_BUILD={{ skip_image_build }}"
 {% if skip_image_build == "1" %}
 
 # Copy in the code from the checkout to the workspace
@@ -28,11 +28,6 @@ rm -rf /vllm-workspace/src || true
 mkdir -p /vllm-workspace/src
 mv /vllm-workspace/vllm /vllm-workspace/src/vllm
 
-# If deps changed, re-install (system-wide in the container)
-{% if requirements_changed == '1' %}
-cd /vllm-workspace
-uv pip install --system -r requirements/common.txt -r requirements/build.txt -r requirements/test.txt
-{% endif %}
 {% endif %}
 
 (command -v nvidia-smi >/dev/null && nvidia-smi || true)
@@ -51,6 +46,13 @@ cd {{ (step.working_dir or default_working_dir) | safe }}
 echo "No command(s) defined for this step." >&2; exit 2
 {%- endif %}
 {%- endmacro %}
+{% macro add_pytest_coverage(cmd, coverage_file) %}
+{% if "pytest " in cmd %}
+COVERAGE_FILE={{ coverage_file }} {{ cmd | replace("pytest ", "pytest --cov=vllm --cov-report= --cov-append --durations=0 ") }} || true
+{% else %}
+{{ cmd }}
+{% endif %}
+{% endmacro %}
 
 steps:
   {% if skip_image_build != "1" %}