Share execution profile pipeline planning

Signed-off-by: yoshifuminakamura <nakamura@riken.jp>

Author: yoshifuminakamura

result_server/routes/admin.py

@@ -31,10 +31,11 @@
     normalize_trigger_definition,
 )
 from utils.gitlab_pipeline import (
-    build_pipeline_plan,
+    build_profile_pipeline_plan,
     configured_gitlab_target,
     configured_gitlab_targets,
     configured_gitlab_trigger_token,
+    profile_scope_csv,
     submit_pipeline_plan,
 )
 from utils.rate_limit import rate_limited
@@ -267,13 +268,6 @@ def _profile_request_status_filter():
     return selected, options[selected]
 
 
-def _profile_scope_csv(profile, key):
-    if not profile:
-        return ""
-    values = profile.get(key) or []
-    return ",".join(str(value).strip() for value in values if str(value).strip())
-
-
 def _default_trigger_ref():
     path = request.path or ""
     return "develop" if path.startswith(("/dev/", "/dev2/")) else "main"
@@ -695,22 +689,17 @@ def _build_execution_pipeline_plan(store):
         exp=exp,
     )
     profile = resolve_result.profile
-    effective_code = code or _profile_scope_csv(profile, "code")
-    effective_system = system or _profile_scope_csv(profile, "system")
-    effective_exp = exp or _profile_scope_csv(profile, "exp")
+    effective_code = code or profile_scope_csv(profile, "code")
+    effective_system = system or profile_scope_csv(profile, "system")
+    effective_exp = exp or profile_scope_csv(profile, "exp")
     gitlab_target, target_errors = configured_gitlab_target(gitlab_target_id)
-    plan = build_pipeline_plan(
+    plan = build_profile_pipeline_plan(
+        profile=profile,
         gitlab_repo=gitlab_target.repo if gitlab_target else "",
         target_ref=target_ref,
         code=effective_code,
         system=effective_system,
-        app="",
-        benchpark=False,
-        park_only=False,
-        park_send=False,
         allocation_project_id=resolve_result.allocation_project_id,
-        activity=str(profile.get("activity", "")) if profile else "",
-        scheduler_extra_args="",
         result_server_url=_portal_result_server_url(),
         target_id=gitlab_target.id if gitlab_target else gitlab_target_id,
     )

result_server/tests/test_gitlab_profile_pipeline.py

@@ -0,0 +1,82 @@
+"""Contracts for translating resolved execution profiles to pipeline inputs."""
+
+import copy
+import os
+import sys
+
+import pytest
+
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
+
+from utils.gitlab_pipeline import (  # noqa: E402
+    build_pipeline_plan,
+    build_profile_pipeline_plan,
+    profile_scope_csv,
+)
+
+
+@pytest.mark.parametrize("profile", [None, {}, {"code": []}, {"code": None}])
+def test_empty_profile_scope(profile):
+    assert profile_scope_csv(profile, "code") == ""
+
+
+@pytest.mark.parametrize(
+    "overrides, expected_scope",
+    [
+        ({}, {"code": "app-a,app-b", "system": "system-a,system-b"}),
+        ({"code": "app-b"}, {"code": "app-b", "system": "system-a,system-b"}),
+        ({"system": "system-b"}, {"code": "app-a,app-b", "system": "system-b"}),
+    ],
+)
+def test_profile_plan_preserves_selection_and_resolved_allocation(overrides, expected_scope):
+    profile = {
+        "code": [" app-a ", "", "app-b"],
+        "system": ["system-a", "system-b"],
+        "exp": ["case-a"],
+        "activity": "Example activity",
+        "allocation_project_id": "unresolved-example",
+        "scheduler_extra_args": "--exclusive",
+    }
+    original = copy.deepcopy(profile)
+    destination = {
+        "gitlab_repo": "gitlab.example.org/group/project.git",
+        "target_ref": "candidate",
+        "target_id": "example",
+        "result_server_url": "https://results.example.org",
+    }
+
+    plan = build_profile_pipeline_plan(
+        profile=profile,
+        allocation_project_id="resolved-example",
+        **destination,
+        **overrides,
+    )
+
+    assert plan == build_pipeline_plan(
+        **destination,
+        **expected_scope,
+        activity="Example activity",
+        allocation_project_id="resolved-example",
+    )
+    assert plan.payload["variables"] == {
+        **expected_scope,
+        "BK_EXECUTION_ACTIVITY": "Example activity",
+        "BK_ALLOCATION_PROJECT_ID": "resolved-example",
+        "RESULT_SERVER": "https://results.example.org",
+    }
+    assert profile == original
+
+
+@pytest.mark.parametrize("profile", [None, {"code": [], "system": []}])
+def test_profile_plan_keeps_destination_errors_without_inventing_profile_values(profile):
+    plan = build_profile_pipeline_plan(
+        profile=profile,
+        allocation_project_id="",
+        gitlab_repo="",
+        target_ref="candidate",
+        result_server_url="",
+    )
+
+    assert plan == build_pipeline_plan(gitlab_repo="", target_ref="candidate")
+    assert plan.errors
+    assert plan.payload["variables"] == {}

result_server/trigger_runner.py

@@ -16,15 +16,15 @@
 try:
     from utils.execution_profiles import ExecutionProfileStore
     from utils.gitlab_pipeline import (
-        build_pipeline_plan,
+        build_profile_pipeline_plan,
         configured_gitlab_target,
         configured_gitlab_trigger_token,
         submit_pipeline_plan,
     )
 except ModuleNotFoundError:  # pragma: no cover - supports python -m result_server.trigger_runner
     from result_server.utils.execution_profiles import ExecutionProfileStore
     from result_server.utils.gitlab_pipeline import (
-        build_pipeline_plan,
+        build_profile_pipeline_plan,
         configured_gitlab_target,
         configured_gitlab_trigger_token,
         submit_pipeline_plan,
@@ -179,12 +179,6 @@ def _trigger_now(trigger: dict, now: datetime) -> tuple[datetime, list[str]]:
         return now, [f"unknown timezone: {timezone_name}"]
 
 
-def _profile_scope_csv(profile: dict | None, key: str) -> str:
-    if not profile:
-        return ""
-    return ",".join(str(value).strip() for value in profile.get(key, []) if str(value).strip())
-
-
 def _build_trigger_plan(
     store: ExecutionProfileStore,
     trigger: dict,
@@ -200,16 +194,11 @@ def _build_trigger_plan(
     profile = profile_result.profile
     gitlab_target, target_errors = configured_gitlab_target(trigger.get("gitlab_target", ""))
     target_ref = trigger.get("target_ref") or os.environ.get("RESULT_SERVER_GITLAB_REF", "")
-    code = _profile_scope_csv(profile, "code")
-    system = _profile_scope_csv(profile, "system")
-    plan = build_pipeline_plan(
+    plan = build_profile_pipeline_plan(
+        profile=profile,
         gitlab_repo=gitlab_target.repo if gitlab_target else "",
         target_ref=target_ref,
-        code=code,
-        system=system,
         allocation_project_id=profile_result.allocation_project_id,
-        activity=str(profile.get("activity", "")) if profile else "",
-        scheduler_extra_args="",
         result_server_url=result_server_url,
         target_id=gitlab_target.id if gitlab_target else trigger.get("gitlab_target", ""),
     )

result_server/utils/gitlab_pipeline.py

@@ -232,6 +232,36 @@ def build_pipeline_plan(
     )
 
 
+def profile_scope_csv(profile: dict | None, key: str) -> str:
+    """Serialize a normalized execution profile scope for pipeline selection."""
+    values = (profile or {}).get(key) or []
+    return ",".join(str(value).strip() for value in values if str(value).strip())
+
+
+def build_profile_pipeline_plan(
+    *,
+    profile: dict | None,
+    allocation_project_id: str,
+    gitlab_repo: str,
+    target_ref: str,
+    result_server_url: str,
+    target_id: str = "",
+    code: str = "",
+    system: str = "",
+) -> GitLabPipelinePlan:
+    """Map a resolved profile to CI inputs; callers retain validation and provenance."""
+    return build_pipeline_plan(
+        gitlab_repo=gitlab_repo,
+        target_ref=target_ref,
+        code=code or profile_scope_csv(profile, "code"),
+        system=system or profile_scope_csv(profile, "system"),
+        allocation_project_id=allocation_project_id,
+        activity=str(profile.get("activity", "")) if profile else "",
+        result_server_url=result_server_url,
+        target_id=target_id,
+    )
+
+
 def submit_pipeline_plan(
     plan: GitLabPipelinePlan,
     *,