Skip to content

[ROCm] pass AMD test commands via VLLM_TEST_COMMANDS env var to fix quoting #298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
khluu merged 1 commit into from
Mar 2, 2026
+11 −5
Merged

[ROCm] pass AMD test commands via VLLM_TEST_COMMANDS env var to fix quoting #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions buildkite/pipeline_generator/buildkite_step.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,8 +299,12 @@ def _create_amd_mirror_step(step: Step, original_commands: List[str], amd: Dict[
if working_dir:
amd_commands_str = f"cd {working_dir} && {amd_commands_str}"

# Add AMD test script wrapper
amd_command_wrapped = f'bash .buildkite/scripts/hardware_ci/run-amd-test.sh "{amd_commands_str}"'
# Pass commands via VLLM_TEST_COMMANDS env var instead of positional
# argument. This preserves all inner quoting (double quotes from
# _prepare_commands' single-to-double conversion, pytest -m/-k
# expressions, etc.) because Buildkite sets env vars directly in the
# process environment without shell interpretation.
amd_command_wrapped = "bash .buildkite/scripts/hardware_ci/run-amd-test.sh"

# Extract device name from queue name
device_type = amd_device.replace("amd_", "") if amd_device.startswith("amd_") else amd_device
Expand Down Expand Up @@ -335,7 +339,7 @@ def _create_amd_mirror_step(step: Step, original_commands: List[str], amd: Dict[
commands=[amd_command_wrapped],
depends_on=["image-build-amd"],
agents={"queue": amd_queue},
env={"DOCKER_BUILDKIT": "1"},
env={"DOCKER_BUILDKIT": "1", "VLLM_TEST_COMMANDS": amd_commands_str},
priority=200,
soft_fail=False,
retry=amd_retry,
Expand Down
3 changes: 2 additions & 1 deletion buildkite/test-template-amd.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,9 +356,10 @@ plugins:
{% else %}
queue: amd_mi325_1
{% endif %}
command: bash .buildkite/scripts/hardware_ci/run-amd-test.sh "(command rocm-smi || true) && export VLLM_TEST_GROUP_NAME={{ step.agent_pool }}-{{ step.label | replace(" ", "-") | lower | replace("(", "") | replace(")", "") | replace("%", "") | replace(",", "-") | replace("+", "-") }} && export VLLM_ALLOW_DEPRECATED_BEAM_SEARCH=1 && cd {{ (step.working_dir or default_working_dir) | safe }} ; {{ step.command or (step.commands | join(" && ")) | safe }}"
command: bash .buildkite/scripts/hardware_ci/run-amd-test.sh
env:
DOCKER_BUILDKIT: "1"
VLLM_TEST_COMMANDS: "(command rocm-smi || true) && export VLLM_TEST_GROUP_NAME={{ step.agent_pool }}-{{ step.label | replace(' ', '-') | lower | replace('(', '') | replace(')', '') | replace('%', '') | replace(',', '-') | replace('+', '-') }} && export VLLM_ALLOW_DEPRECATED_BEAM_SEARCH=1 && cd {{ (step.working_dir or default_working_dir) | safe }} && {{ step.command or (step.commands | join(' && ')) | safe }}"
priority: 100
{% if step.grade and step.grade == "Blocking" %}
soft_fail: false
Expand Down
3 changes: 2 additions & 1 deletion buildkite/test-template-ci.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,9 +612,10 @@ steps:
{% else %}
queue: amd_mi325_1
{% endif%}
command: bash .buildkite/scripts/hardware_ci/run-amd-test.sh "(command rocm-smi || true) && export VLLM_ALLOW_DEPRECATED_BEAM_SEARCH=1 && cd {{ (step.working_dir or default_working_dir) | safe }} ; {{ step.command or (step.commands | join(" && ")) | safe }}"
command: bash .buildkite/scripts/hardware_ci/run-amd-test.sh
env:
DOCKER_BUILDKIT: "1"
VLLM_TEST_COMMANDS: "(command rocm-smi || true) && export VLLM_ALLOW_DEPRECATED_BEAM_SEARCH=1 && cd {{ (step.working_dir or default_working_dir) | safe }} && {{ step.command or (step.commands | join(' && ')) | safe }}"
priority: 100
{% endif %}
{% endfor %}
Expand Down