Revert #184 and #194 (#205)

Signed-off-by: Kevin H. Luu <[email protected]>

Author: Kevin H. Luu

buildkite/test-template-ci.j2

@@ -20,19 +20,6 @@
 {% set hf_home_fsx = "/fsx/hf_cache" %}
 {% set list_file_diff = list_file_diff | split("|") %}
 
-{# Intelligent test targeting: Detect when only test files changed and collect them #}
-{%- set tests_acc = namespace(only_tests=true, any=false, changed=[]) %}
-{%- for file in list_file_diff %}
-{%- if file[:6] == 'tests/' and '/test_' in file and file[-3:] == '.py' %}
-{%- set tests_acc.any = true %}
-{%- set tests_acc.changed = tests_acc.changed + [file[6:]] %}
-{%- else %}
-{%- set tests_acc.only_tests = false %}
-{%- endif %}
-{%- endfor %}
-{%- set tests_only = (tests_acc.only_tests and tests_acc.any) %}
-{%- set changed_tests = tests_acc.changed %}
-
 {% 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
@@ -47,131 +34,6 @@ COVERAGE_FILE={{ coverage_file }} {{ cmd | replace("pytest ", "pytest --cov=vllm
 {% set step_first = step.label | first | default("x") %}
 {% set coverage_file = ".coverage." + step_length ~ "_" ~ step_first %}
 
-{# Intelligent test targeting: Build matched test targets for this step when only tests changed #}
-{%- set match_ns = namespace(targets=[]) %}
-{%- if tests_only and step.source_file_dependencies %}
-{%- for dep in step.source_file_dependencies %}
-{%- if dep[:6] == 'tests/' %}
-{%- set dep_rel = dep[6:] %}
-{# Handle deps that already end with '/' (e.g., tests/benchmarks/) #}
-{%- if dep_rel[-1:] == '/' %}
-{%- set dep_dir_prefix = dep_rel %}
-{%- set dep_file_name = dep_rel[:-1] ~ '.py' %}
-{%- else %}
-{%- set dep_dir_prefix = dep_rel ~ '/' %}
-{%- set dep_file_name = dep_rel ~ '.py' %}
-{%- endif %}
-{%- for t in changed_tests %}
-{# Check if t starts with dep_dir_prefix (for directories) or equals dep_file_name (for files) #}
-{%- set prefix_len = dep_dir_prefix | length %}
-{%- set t_prefix = t[:prefix_len] %}
-{%- set cond1 = (t | length >= prefix_len and t_prefix == dep_dir_prefix) %}
-{%- set cond2 = (t == dep_file_name) %}
-{%- if cond1 or cond2 %}
-{%- set match_ns.targets = match_ns.targets + [t] %}
-{%- endif %}
-{%- endfor %}
-{%- endif %}
-{%- endfor %}
-{%- endif %}
-{%- set matched_targets = match_ns.targets %}
-
-{# Filter matched targets to only include those actually covered by step commands #}
-{# This ensures intelligent filtering mirrors normal behavior - if a test isn't run normally, don't run it in intelligent mode #}
-{%- set filter_ns = namespace(filtered_targets=[], covered_paths=[]) %}
-{%- if matched_targets | length > 0 %}
-{%- set all_commands = step.commands if step.commands else ([step.command] if step.command else []) %}
-{# Extract test paths from pytest commands (e.g., "v1/core", "v1/executor") #}
-{%- for cmd in all_commands %}
-{%- if "pytest " in cmd %}
-{# Split command to find pytest arguments #}
-{%- set cmd_parts = cmd | split(" ") | list %}
-{%- set in_pytest = false %}
-{%- for part in cmd_parts %}
-{%- if part == "pytest" %}
-{%- set in_pytest = true %}
-{%- elif in_pytest and part[:1] != "-" and "/" in part %}
-{# This looks like a test path (contains / and doesn't start with -) #}
-{# Skip specific tests (contain ::) - we only want directories or files #}
-{%- if "::" not in part %}
-{%- if part[-3:] == ".py" %}
-{# It's a file - add both the file itself and its directory (if deep enough) #}
-{# Add the file as-is for exact matching #}
-{%- set filter_ns.covered_paths = filter_ns.covered_paths + [part] %}
-{# Also add directory if it has at least 2 levels (e.g., v1/core but not just v1) #}
-{%- set path_parts = part | split("/") | list %}
-{%- if path_parts | length > 2 %}
-{%- set dir_parts = path_parts[:-1] %}
-{%- set dir_path = dir_parts | join("/") %}
-{%- set filter_ns.covered_paths = filter_ns.covered_paths + [dir_path] %}
-{%- endif %}
-{%- else %}
-{# It's a directory path #}
-{%- set filter_ns.covered_paths = filter_ns.covered_paths + [part] %}
-{%- endif %}
-{%- endif %}
-{%- endif %}
-{%- endfor %}
-{%- endif %}
-{%- endfor %}
-{# Now check each matched target against covered paths #}
-{%- for target in matched_targets %}
-{%- set target_ns = namespace(is_covered=false) %}
-{%- for covered_path in filter_ns.covered_paths %}
-{# Check if target starts with this covered path (ensure proper directory matching) #}
-{%- set covered_len = covered_path | length %}
-{%- if target[:covered_len] == covered_path %}
-{# Ensure it's a proper directory match (next char is / or end of string) #}
-{%- if target | length == covered_len or target[covered_len:covered_len+1] == "/" %}
-{%- set target_ns.is_covered = true %}
-{%- endif %}
-{%- endif %}
-{%- endfor %}
-{%- if target_ns.is_covered %}
-{%- set filter_ns.filtered_targets = filter_ns.filtered_targets + [target] %}
-{%- endif %}
-{%- endfor %}
-{%- endif %}
-{%- set matched_targets = filter_ns.filtered_targets %}
-
-{# Extract pytest markers from original commands to preserve them in intelligent filtering #}
-{%- set marker_ns = namespace(markers='') %}
-{%- if matched_targets | length > 0 %}
-{%- set all_commands = step.commands if step.commands else ([step.command] if step.command else []) %}
-{%- for cmd in all_commands %}
-{%- if "pytest " in cmd and " -m " in cmd %}
-{# Extract the -m marker argument using split filter and convert to list #}
-{%- set parts = cmd | split(" -m ") | list %}
-{%- if parts | length > 1 %}
-{%- set after_m = parts[1] %}
-{# Find the marker value (first token after -m, handling quotes) #}
-{%- if after_m[0:1] == "'" %}
-{%- set marker_parts = after_m[1:] | split("'") | list %}
-{%- if marker_parts | length > 0 %}
-{%- set marker_ns.markers = " -m '" ~ marker_parts[0] ~ "'" %}
-{%- endif %}
-{%- elif after_m[0:1] == '"' %}
-{%- set marker_parts = after_m[1:] | split('"') | list %}
-{%- if marker_parts | length > 0 %}
-{%- set marker_ns.markers = ' -m "' ~ marker_parts[0] ~ '"' %}
-{%- endif %}
-{%- else %}
-{# No quotes, take first word #}
-{%- set marker_parts = after_m | split(" ") | list %}
-{%- if marker_parts | length > 0 %}
-{%- set marker_ns.markers = " -m " ~ marker_parts[0] %}
-{%- endif %}
-{%- endif %}
-{%- endif %}
-{%- endif %}
-{%- endfor %}
-{%- endif %}
-
-{# If we have matched targets, run only those specific tests #}
-{% if matched_targets | length > 0 %}
-pytest -v -s{{ marker_ns.markers }} {{ matched_targets | join(' ') }}
-{% else %}
-{# Default behavior: preserve original commands with optional coverage injection #}
 {% if cov_enabled %}
 {% set ns = namespace(has_pytest=false) %}
 {% if step.command %}
@@ -185,7 +47,6 @@ pytest -v -s{{ marker_ns.markers }} {{ matched_targets | join(' ') }}
 {% else %}
 {{ step.command or (step.commands | join(' && ')) | safe }}
 {% endif %}
-{% endif %}
 {% endmacro %}
 
 {% macro render_cuda_config(step, image, default_working_dir, hf_home_fsx, hf_home, branch) %}