Skip to content

Commit e6d67ca

Browse files
committed
Fix issue with scenario
1 parent 5ab9c08 commit e6d67ca

File tree

1 file changed

+15
-5
lines changed

1 file changed

+15
-5
lines changed

scripts/release/pipeline_main.py

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ def build_image(image_name: str, build_configuration: ImageBuildConfiguration):
8181
def image_build_config_from_args(args) -> ImageBuildConfiguration:
8282
image = args.image
8383

84-
build_scenario = BuildScenario(args.scenario) or BuildScenario.infer_scenario_from_environment()
84+
build_scenario = get_scenario_from_arg(args.scenario) or BuildScenario.infer_scenario_from_environment()
8585

8686
build_info = load_build_info(build_scenario)
8787
image_build_info = build_info.images.get(image)
@@ -92,7 +92,7 @@ def image_build_config_from_args(args) -> ImageBuildConfiguration:
9292
# TODO: cover versions for agents and OM images
9393
version = args.version or image_build_info.version
9494
registry = args.registry or image_build_info.repository
95-
platforms = get_platforms_from_arg(args) or image_build_info.platforms
95+
platforms = get_platforms_from_arg(args.platform) or image_build_info.platforms
9696
sign = args.sign or image_build_info.sign
9797
# TODO: remove "all_agents" from context and environment variables support (not needed anymore)
9898
all_agents = args.all_agents or build_scenario.all_agents()
@@ -109,12 +109,22 @@ def image_build_config_from_args(args) -> ImageBuildConfiguration:
109109
)
110110

111111

112-
def get_platforms_from_arg(args):
112+
def get_scenario_from_arg(args_scenario: str) -> BuildScenario | None:
113+
if args_scenario:
114+
try:
115+
return BuildScenario(args_scenario)
116+
except ValueError as e:
117+
raise ValueError(f"Invalid scenario '{args_scenario}': {e}")
118+
119+
return None
120+
121+
122+
def get_platforms_from_arg(args_platforms: str) -> list[str] | None:
113123
"""Parse and validate the --platform argument"""
114-
platforms = [p.strip() for p in args.platform.split(",")]
124+
platforms = [p.strip() for p in args_platforms.split(",")]
115125
if any(p not in SUPPORTED_PLATFORMS for p in platforms):
116126
raise ValueError(
117-
f"Unsupported platform in --platforms '{args.platform}'. Supported platforms: {', '.join(SUPPORTED_PLATFORMS)}"
127+
f"Unsupported platform in --platforms '{args_platforms}'. Supported platforms: {', '.join(SUPPORTED_PLATFORMS)}"
118128
)
119129
return platforms
120130

0 commit comments

Comments
 (0)