Skip to content

Commit 04fbd13

Browse files
authored
Merge pull request #2083 from max-svistunov/lcore-2342-migrate-test-configs
LCORE-2342: migrate in-repo e2e test configs to unified mode
2 parents 2109790 + 1fe3804 commit 04fbd13

18 files changed

Lines changed: 94 additions & 17 deletions

tests/e2e/configuration/README.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,32 @@ This directory contains configuration files used for end-to-end testing of Light
77
- `server-mode/` - Configurations for testing when LCore connects to a separate Llama Stack service
88
- `library-mode/` - Configurations for testing when LCore embeds Llama Stack as a library
99

10+
## Library mode uses unified configs (LCORE-2342)
11+
12+
The library-mode configurations use the unified single-file format: instead of
13+
the legacy `llama_stack.library_client_config_path`, they carry
14+
15+
```yaml
16+
llama_stack:
17+
use_as_library_client: true
18+
config:
19+
profile: run.yaml
20+
```
21+
22+
The harness/CI copies the provider-specific run config
23+
(`tests/e2e/configs/run-<environment>.yaml`) to `./run.yaml` in the repo root,
24+
and the active `lightspeed-stack.yaml` is also copied to the repo root — so the
25+
relative `profile:` path resolves to that materialized file, which the unified
26+
synthesizer consumes as its baseline. LS behavior is identical to the legacy
27+
two-file path (requirement R7 in the config-merge design doc); the wiring that
28+
selects a provider config stays unchanged.
29+
30+
The `tests/e2e/configs/run-*.yaml` files therefore serve a dual role: in
31+
server mode they are the run configuration of the standalone Llama Stack
32+
service, and in library mode they are consumed as the unified-mode synthesis
33+
profile. No in-repo test config references them via the legacy mechanism
34+
anymore.
35+
1036
## Common Configuration Features
1137

1238
### Default Configurations (`lightspeed-stack.yaml`)

tests/e2e/configuration/library-mode/lightspeed-stack-auth-noop-token.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ service:
88
access_log: true
99
llama_stack:
1010
use_as_library_client: true
11-
library_client_config_path: run.yaml
11+
# Unified mode: run.yaml (materialized per provider by CI/the harness)
12+
# is consumed as the synthesis profile instead of the legacy two-file path.
13+
config:
14+
profile: run.yaml
1215
user_data_collection:
1316
feedback_enabled: true
1417
feedback_storage: "/tmp/data/feedback"

tests/e2e/configuration/library-mode/lightspeed-stack-auth-rh-identity.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ service:
88
access_log: true
99
llama_stack:
1010
use_as_library_client: true
11-
library_client_config_path: run.yaml
11+
# Unified mode: run.yaml (materialized per provider by CI/the harness)
12+
# is consumed as the synthesis profile instead of the legacy two-file path.
13+
config:
14+
profile: run.yaml
1215
user_data_collection:
1316
feedback_enabled: true
1417
feedback_storage: "/tmp/data/feedback"

tests/e2e/configuration/library-mode/lightspeed-stack-byok-pdf.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ service:
88
access_log: true
99
llama_stack:
1010
use_as_library_client: true
11-
library_client_config_path: run.yaml
11+
# Unified mode: run.yaml (materialized per provider by CI/the harness)
12+
# is consumed as the synthesis profile instead of the legacy two-file path.
13+
config:
14+
profile: run.yaml
1215
user_data_collection:
1316
feedback_enabled: true
1417
feedback_storage: "/tmp/data/feedback"

tests/e2e/configuration/library-mode/lightspeed-stack-inline-rag.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ service:
88
access_log: true
99
llama_stack:
1010
use_as_library_client: true
11-
library_client_config_path: run.yaml
11+
# Unified mode: run.yaml (materialized per provider by CI/the harness)
12+
# is consumed as the synthesis profile instead of the legacy two-file path.
13+
config:
14+
profile: run.yaml
1215
user_data_collection:
1316
feedback_enabled: true
1417
feedback_storage: "/tmp/data/feedback"

tests/e2e/configuration/library-mode/lightspeed-stack-invalid-feedback-storage.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ service:
88
access_log: true
99
llama_stack:
1010
use_as_library_client: true
11-
library_client_config_path: run.yaml
11+
# Unified mode: run.yaml (materialized per provider by CI/the harness)
12+
# is consumed as the synthesis profile instead of the legacy two-file path.
13+
config:
14+
profile: run.yaml
1215
user_data_collection:
1316
feedback_enabled: true
1417
feedback_storage: "/invalid"

tests/e2e/configuration/library-mode/lightspeed-stack-invalid-mcp-file-auth.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ service:
99
llama_stack:
1010
# Library mode - embeds llama-stack as library
1111
use_as_library_client: true
12-
library_client_config_path: run.yaml
12+
# Unified mode: run.yaml (materialized per provider by CI/the harness)
13+
# is consumed as the synthesis profile instead of the legacy two-file path.
14+
config:
15+
profile: run.yaml
1316
user_data_collection:
1417
feedback_enabled: true
1518
feedback_storage: "/tmp/data/feedback"

tests/e2e/configuration/library-mode/lightspeed-stack-mcp-auth.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ service:
99
llama_stack:
1010
# Library mode - embeds llama-stack as library
1111
use_as_library_client: true
12-
library_client_config_path: run.yaml
12+
# Unified mode: run.yaml (materialized per provider by CI/the harness)
13+
# is consumed as the synthesis profile instead of the legacy two-file path.
14+
config:
15+
profile: run.yaml
1316
user_data_collection:
1417
feedback_enabled: true
1518
feedback_storage: "/tmp/data/feedback"

tests/e2e/configuration/library-mode/lightspeed-stack-mcp-client-auth.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ service:
99
llama_stack:
1010
# Library mode - embeds llama-stack as library
1111
use_as_library_client: true
12-
library_client_config_path: run.yaml
12+
# Unified mode: run.yaml (materialized per provider by CI/the harness)
13+
# is consumed as the synthesis profile instead of the legacy two-file path.
14+
config:
15+
profile: run.yaml
1316
user_data_collection:
1417
feedback_enabled: true
1518
feedback_storage: "/tmp/data/feedback"

tests/e2e/configuration/library-mode/lightspeed-stack-mcp-file-auth.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ service:
99
llama_stack:
1010
# Library mode - embeds llama-stack as library
1111
use_as_library_client: true
12-
library_client_config_path: run.yaml
12+
# Unified mode: run.yaml (materialized per provider by CI/the harness)
13+
# is consumed as the synthesis profile instead of the legacy two-file path.
14+
config:
15+
profile: run.yaml
1316
user_data_collection:
1417
feedback_enabled: true
1518
feedback_storage: "/tmp/data/feedback"

0 commit comments

Comments
 (0)