config: organize scenario stacks into method sections#1642
Open
hubunt wants to merge 1 commit into
Open
Conversation
hubunt
requested review from
Vezio,
achandrasekar,
kalantar,
maugustosilva,
mengmeiye and
namasl
as code owners
July 15, 2026 07:32
Collaborator
|
Pretty good intentions here to solve that issue, tagging as DNM for now until we can go through a bit more testing to ensure existing functionality doesn't break. Thank you for these changes, this is an amazing step forward to reduce redundant configurations. |
Collaborator
|
In the meantime, can you resolve some of the conflicts being reported above? |
Signed-off-by: hubunt <150658615+hubunt@users.noreply.github.com>
hubunt
force-pushed
the
hubunt/scenario-sections
branch
from
July 16, 2026 05:21
1dbf63f to
04aeb0d
Compare
Contributor
Author
|
Conflicts are resolved and the branch is rebased onto current main. The updated signed head is |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Reorganize scenario stacks into the four well-defined sections proposed in #1064:
common,standalone,modelservice, andfma.Common settings are expanded into the effective configuration inherited by every standup method, while method-specific modelservice settings can be nested under
modelservice. The resolvedconfig.yamlremains flat for existing templates and execution steps.Motivation
Fixes #1064.
Scenario stacks currently mix shared settings such as
model,storage, andvllmCommonwith method-specific settings such asprefill,decode, andinferenceExtension. This makes the scope of each field unclear and forces scenario files to rely on comment headers instead of an explicit YAML structure.What changed
commonsections before defaults, shared settings, and stack overrides are merged.common,prefill,decode,inferenceExtension, andmultinodein addition to the existing gateway/router sections.stack.commonorshared.commonis not a mapping.common.workDir.Testing
python -m pytest tests -qpython -m pytest tests/test_scenario_sections.py tests/test_hoist_modelservice_sections.py tests/test_config_schema.py -qpre-commit runconfig.yamldictionaries with the versions from upstreammain.config/scenarios/examples/fma.yaml: identical.config/scenarios/cicd/ocp.yaml: identical.git diff --checkBackward Compatibility
Legacy flat scenario keys remain supported and render unchanged. If both a legacy flat key and its sectioned spelling are present in the same scenario layer, the sectioned value wins. Treatment and CLI overrides continue to take final precedence.
The modelservice Helm chart's own
commonvalues can be written asmodelservice.common, avoiding ambiguity with the stack-levelcommonsection.Checklist
pre-commit runwas run and all checks passed.