Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion .github/workflows/_e2e_nightly_multi_node.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,7 @@ jobs:
BISECT_NO_VERIFY_BAD: ${{ inputs.bisect_no_verify_bad }}
BISECT_FORCE_INITIAL_BUILD: ${{ inputs.bisect_force_initial_build }}
BISECT_CONFIG_BASE_PATH: ${{ inputs.bisect_config_base_path }}
OPENLIBING_SECRET: ${{ secrets.OPENLIBING_SECRET }}
run: |
set -euo pipefail

Expand Down Expand Up @@ -300,7 +301,7 @@ jobs:
-D runner="$runner" \
-D aop_multi_enabled="${{ inputs.aop_multi_enabled }}" \
-D good_table="/root/.cache/vllm-ascend/${{ inputs.vllm_ascend_branch || 'main' }}/${{ inputs.test_frequency }}/good_table.csv" \
-D openlibing_secret="$OPENLIBING_SECRET" \
-D openlibing_secret="${OPENLIBING_SECRET:-}" \
-D vllm_ascend_branch="${{ inputs.vllm_ascend_branch }}" \
-D soc_version="${{ inputs.soc_version }}" \
-D npu_resource_name="${npu_resource_name:-}" \
Expand Down
8 changes: 4 additions & 4 deletions tests/e2e/nightly/multi_node/scripts/lws.yaml.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,13 @@ spec:
"{{ max_good_age_days | default("3") }}"
resources:
limits:
{{ npu_resource_name | default("huawei.com/ascend-1980") }}: {{ npu_per_node | default("16") }}

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

In Jinja2, the default filter only falls back to the default value if the variable is undefined. If npu_resource_name or npu_per_node are defined but passed as empty strings (e.g., ""), they will evaluate to empty strings, resulting in invalid YAML (e.g., an empty key or missing value under limits:). Passing true as the second argument to default ensures they fall back to their default values for empty strings or other falsy values.

                {{ npu_resource_name | default("huawei.com/ascend-1980", true) }}: {{ npu_per_node | default("16", true) }}

memory: 512Gi
ephemeral-storage: 100Gi
huawei.com/ascend-1980: {{ npu_per_node | default("16") }}
requests:
{{ npu_resource_name | default("huawei.com/ascend-1980") }}: {{ npu_per_node | default("16") }}

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

In Jinja2, the default filter only falls back to the default value if the variable is undefined. If npu_resource_name or npu_per_node are defined but passed as empty strings (e.g., ""), they will evaluate to empty strings, resulting in invalid YAML (e.g., an empty key or missing value under requests:). Passing true as the second argument to default ensures they fall back to their default values for empty strings or other falsy values.

                {{ npu_resource_name | default("huawei.com/ascend-1980", true) }}: {{ npu_per_node | default("16", true) }}

ephemeral-storage: 100Gi
cpu: 125
huawei.com/ascend-1980: {{ npu_per_node | default("16") }}
ports:
- containerPort: 8080
volumeMounts:
Expand Down Expand Up @@ -177,13 +177,13 @@ spec:
"{{ max_good_age_days | default("3") }}"
resources:
limits:
{{ npu_resource_name | default("huawei.com/ascend-1980") }}: {{ npu_per_node | default("16") }}

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

In Jinja2, the default filter only falls back to the default value if the variable is undefined. If npu_resource_name or npu_per_node are defined but passed as empty strings (e.g., ""), they will evaluate to empty strings, resulting in invalid YAML (e.g., an empty key or missing value under limits:). Passing true as the second argument to default ensures they fall back to their default values for empty strings or other falsy values.

                {{ npu_resource_name | default("huawei.com/ascend-1980", true) }}: {{ npu_per_node | default("16", true) }}

memory: 512Gi
ephemeral-storage: 100Gi
huawei.com/ascend-1980: {{ npu_per_node | default("16") }}
requests:
{{ npu_resource_name | default("huawei.com/ascend-1980") }}: {{ npu_per_node | default("16") }}

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

In Jinja2, the default filter only falls back to the default value if the variable is undefined. If npu_resource_name or npu_per_node are defined but passed as empty strings (e.g., ""), they will evaluate to empty strings, resulting in invalid YAML (e.g., an empty key or missing value under requests:). Passing true as the second argument to default ensures they fall back to their default values for empty strings or other falsy values.

                {{ npu_resource_name | default("huawei.com/ascend-1980", true) }}: {{ npu_per_node | default("16", true) }}

ephemeral-storage: 100Gi
cpu: 125
huawei.com/ascend-1980: {{ npu_per_node | default("16") }}
volumeMounts:
- mountPath: /root/.cache
name: shared-volume
Expand Down
Loading