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
13 changes: 2 additions & 11 deletions pipeline/tasks/phases/evaluate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1661,22 +1661,13 @@ spec:
- secretRef:
name: $(params.openshell-oidc-secret)
optional: true
- secretRef:
name: inference
optional: false
env:
- name: HOME
value: /tmp/openshell-home
- name: INFERENCE_API_KEY
valueFrom:
secretKeyRef:
name: inference
key: api_key
value: "$(params.llm-api-key)"
- name: OPENAI_API_KEY
valueFrom:
secretKeyRef:
name: inference
key: api_key
value: "$(params.llm-api-key)"
- name: AGENT_EVAL_RUNS_DIR
value: $(workspaces.source.path)/reports
- name: OPENSHELL_GATEWAY_ENDPOINT
Expand Down
19 changes: 19 additions & 0 deletions tests/test_openshell_pipeline_profile.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,25 @@ def test_evaluate_openshell_step_logs_mlflow(self):
assert uri_note in openshell
assert openshell.find(uri_note) < openshell.find("scripts/run_aeh.py")

def test_openshell_eval_uses_llm_param_instead_of_inference_secret(self):
task = _load(REPO / "pipeline" / "tasks" / "phases" / "evaluate.yaml")
openshell = next(step for step in task["spec"]["steps"] if step["name"] == "aeh-openshell-eval")

env_from_secret_names = {
source["secretRef"]["name"] for source in openshell.get("envFrom", []) if "secretRef" in source
}
env_secret_names = {
env["valueFrom"]["secretKeyRef"]["name"]
for env in openshell.get("env", [])
if "secretKeyRef" in env.get("valueFrom", {})
}
assert "inference" not in env_from_secret_names | env_secret_names

for name in ("INFERENCE_API_KEY", "OPENAI_API_KEY"):
env = next(item for item in openshell["env"] if item["name"] == name)
assert env["value"] == "$(params.llm-api-key)"
assert "valueFrom" not in env

def test_harbor_profiles_still_include_test(self):
for path in (CI, CI_DEV):
names = _task_names(_load(path)["spec"])
Expand Down
Loading