diff --git a/tests/e2e/configuration/README.md b/tests/e2e/configuration/README.md index c9d40aac8..1a8d700ca 100644 --- a/tests/e2e/configuration/README.md +++ b/tests/e2e/configuration/README.md @@ -7,6 +7,32 @@ This directory contains configuration files used for end-to-end testing of Light - `server-mode/` - Configurations for testing when LCore connects to a separate Llama Stack service - `library-mode/` - Configurations for testing when LCore embeds Llama Stack as a library +## Library mode uses unified configs (LCORE-2342) + +The library-mode configurations use the unified single-file format: instead of +the legacy `llama_stack.library_client_config_path`, they carry + +```yaml +llama_stack: + use_as_library_client: true + config: + profile: run.yaml +``` + +The harness/CI copies the provider-specific run config +(`tests/e2e/configs/run-.yaml`) to `./run.yaml` in the repo root, +and the active `lightspeed-stack.yaml` is also copied to the repo root — so the +relative `profile:` path resolves to that materialized file, which the unified +synthesizer consumes as its baseline. LS behavior is identical to the legacy +two-file path (requirement R7 in the config-merge design doc); the wiring that +selects a provider config stays unchanged. + +The `tests/e2e/configs/run-*.yaml` files therefore serve a dual role: in +server mode they are the run configuration of the standalone Llama Stack +service, and in library mode they are consumed as the unified-mode synthesis +profile. No in-repo test config references them via the legacy mechanism +anymore. + ## Common Configuration Features ### Default Configurations (`lightspeed-stack.yaml`) diff --git a/tests/e2e/configuration/library-mode/lightspeed-stack-auth-noop-token.yaml b/tests/e2e/configuration/library-mode/lightspeed-stack-auth-noop-token.yaml index 2c55ae440..ca8b4476c 100644 --- a/tests/e2e/configuration/library-mode/lightspeed-stack-auth-noop-token.yaml +++ b/tests/e2e/configuration/library-mode/lightspeed-stack-auth-noop-token.yaml @@ -8,7 +8,10 @@ service: access_log: true llama_stack: use_as_library_client: true - library_client_config_path: run.yaml + # Unified mode: run.yaml (materialized per provider by CI/the harness) + # is consumed as the synthesis profile instead of the legacy two-file path. + config: + profile: run.yaml user_data_collection: feedback_enabled: true feedback_storage: "/tmp/data/feedback" diff --git a/tests/e2e/configuration/library-mode/lightspeed-stack-auth-rh-identity.yaml b/tests/e2e/configuration/library-mode/lightspeed-stack-auth-rh-identity.yaml index ba2c50367..433e77fec 100644 --- a/tests/e2e/configuration/library-mode/lightspeed-stack-auth-rh-identity.yaml +++ b/tests/e2e/configuration/library-mode/lightspeed-stack-auth-rh-identity.yaml @@ -8,7 +8,10 @@ service: access_log: true llama_stack: use_as_library_client: true - library_client_config_path: run.yaml + # Unified mode: run.yaml (materialized per provider by CI/the harness) + # is consumed as the synthesis profile instead of the legacy two-file path. + config: + profile: run.yaml user_data_collection: feedback_enabled: true feedback_storage: "/tmp/data/feedback" diff --git a/tests/e2e/configuration/library-mode/lightspeed-stack-byok-pdf.yaml b/tests/e2e/configuration/library-mode/lightspeed-stack-byok-pdf.yaml index 4d04eaac5..da9924d84 100644 --- a/tests/e2e/configuration/library-mode/lightspeed-stack-byok-pdf.yaml +++ b/tests/e2e/configuration/library-mode/lightspeed-stack-byok-pdf.yaml @@ -8,7 +8,10 @@ service: access_log: true llama_stack: use_as_library_client: true - library_client_config_path: run.yaml + # Unified mode: run.yaml (materialized per provider by CI/the harness) + # is consumed as the synthesis profile instead of the legacy two-file path. + config: + profile: run.yaml user_data_collection: feedback_enabled: true feedback_storage: "/tmp/data/feedback" diff --git a/tests/e2e/configuration/library-mode/lightspeed-stack-inline-rag.yaml b/tests/e2e/configuration/library-mode/lightspeed-stack-inline-rag.yaml index ffd744da6..f73c4d9c3 100644 --- a/tests/e2e/configuration/library-mode/lightspeed-stack-inline-rag.yaml +++ b/tests/e2e/configuration/library-mode/lightspeed-stack-inline-rag.yaml @@ -8,7 +8,10 @@ service: access_log: true llama_stack: use_as_library_client: true - library_client_config_path: run.yaml + # Unified mode: run.yaml (materialized per provider by CI/the harness) + # is consumed as the synthesis profile instead of the legacy two-file path. + config: + profile: run.yaml user_data_collection: feedback_enabled: true feedback_storage: "/tmp/data/feedback" diff --git a/tests/e2e/configuration/library-mode/lightspeed-stack-invalid-feedback-storage.yaml b/tests/e2e/configuration/library-mode/lightspeed-stack-invalid-feedback-storage.yaml index f29418fb1..16edc3ddf 100644 --- a/tests/e2e/configuration/library-mode/lightspeed-stack-invalid-feedback-storage.yaml +++ b/tests/e2e/configuration/library-mode/lightspeed-stack-invalid-feedback-storage.yaml @@ -8,7 +8,10 @@ service: access_log: true llama_stack: use_as_library_client: true - library_client_config_path: run.yaml + # Unified mode: run.yaml (materialized per provider by CI/the harness) + # is consumed as the synthesis profile instead of the legacy two-file path. + config: + profile: run.yaml user_data_collection: feedback_enabled: true feedback_storage: "/invalid" diff --git a/tests/e2e/configuration/library-mode/lightspeed-stack-invalid-mcp-file-auth.yaml b/tests/e2e/configuration/library-mode/lightspeed-stack-invalid-mcp-file-auth.yaml index 362cce3c5..bdfe7e194 100644 --- a/tests/e2e/configuration/library-mode/lightspeed-stack-invalid-mcp-file-auth.yaml +++ b/tests/e2e/configuration/library-mode/lightspeed-stack-invalid-mcp-file-auth.yaml @@ -9,7 +9,10 @@ service: llama_stack: # Library mode - embeds llama-stack as library use_as_library_client: true - library_client_config_path: run.yaml + # Unified mode: run.yaml (materialized per provider by CI/the harness) + # is consumed as the synthesis profile instead of the legacy two-file path. + config: + profile: run.yaml user_data_collection: feedback_enabled: true feedback_storage: "/tmp/data/feedback" diff --git a/tests/e2e/configuration/library-mode/lightspeed-stack-mcp-auth.yaml b/tests/e2e/configuration/library-mode/lightspeed-stack-mcp-auth.yaml index 608d5ec52..553dc0eae 100644 --- a/tests/e2e/configuration/library-mode/lightspeed-stack-mcp-auth.yaml +++ b/tests/e2e/configuration/library-mode/lightspeed-stack-mcp-auth.yaml @@ -9,7 +9,10 @@ service: llama_stack: # Library mode - embeds llama-stack as library use_as_library_client: true - library_client_config_path: run.yaml + # Unified mode: run.yaml (materialized per provider by CI/the harness) + # is consumed as the synthesis profile instead of the legacy two-file path. + config: + profile: run.yaml user_data_collection: feedback_enabled: true feedback_storage: "/tmp/data/feedback" diff --git a/tests/e2e/configuration/library-mode/lightspeed-stack-mcp-client-auth.yaml b/tests/e2e/configuration/library-mode/lightspeed-stack-mcp-client-auth.yaml index a46f98414..0900ec16a 100644 --- a/tests/e2e/configuration/library-mode/lightspeed-stack-mcp-client-auth.yaml +++ b/tests/e2e/configuration/library-mode/lightspeed-stack-mcp-client-auth.yaml @@ -9,7 +9,10 @@ service: llama_stack: # Library mode - embeds llama-stack as library use_as_library_client: true - library_client_config_path: run.yaml + # Unified mode: run.yaml (materialized per provider by CI/the harness) + # is consumed as the synthesis profile instead of the legacy two-file path. + config: + profile: run.yaml user_data_collection: feedback_enabled: true feedback_storage: "/tmp/data/feedback" diff --git a/tests/e2e/configuration/library-mode/lightspeed-stack-mcp-file-auth.yaml b/tests/e2e/configuration/library-mode/lightspeed-stack-mcp-file-auth.yaml index e6109995c..f99b91ea4 100644 --- a/tests/e2e/configuration/library-mode/lightspeed-stack-mcp-file-auth.yaml +++ b/tests/e2e/configuration/library-mode/lightspeed-stack-mcp-file-auth.yaml @@ -9,7 +9,10 @@ service: llama_stack: # Library mode - embeds llama-stack as library use_as_library_client: true - library_client_config_path: run.yaml + # Unified mode: run.yaml (materialized per provider by CI/the harness) + # is consumed as the synthesis profile instead of the legacy two-file path. + config: + profile: run.yaml user_data_collection: feedback_enabled: true feedback_storage: "/tmp/data/feedback" diff --git a/tests/e2e/configuration/library-mode/lightspeed-stack-mcp-kubernetes-auth.yaml b/tests/e2e/configuration/library-mode/lightspeed-stack-mcp-kubernetes-auth.yaml index d00ae8f0e..bd0dc7cb7 100644 --- a/tests/e2e/configuration/library-mode/lightspeed-stack-mcp-kubernetes-auth.yaml +++ b/tests/e2e/configuration/library-mode/lightspeed-stack-mcp-kubernetes-auth.yaml @@ -9,7 +9,10 @@ service: llama_stack: # Library mode - embeds llama-stack as library use_as_library_client: true - library_client_config_path: run.yaml + # Unified mode: run.yaml (materialized per provider by CI/the harness) + # is consumed as the synthesis profile instead of the legacy two-file path. + config: + profile: run.yaml user_data_collection: feedback_enabled: true feedback_storage: "/tmp/data/feedback" diff --git a/tests/e2e/configuration/library-mode/lightspeed-stack-mcp-oauth-auth.yaml b/tests/e2e/configuration/library-mode/lightspeed-stack-mcp-oauth-auth.yaml index ce0b78d71..557b3f577 100644 --- a/tests/e2e/configuration/library-mode/lightspeed-stack-mcp-oauth-auth.yaml +++ b/tests/e2e/configuration/library-mode/lightspeed-stack-mcp-oauth-auth.yaml @@ -9,7 +9,10 @@ service: llama_stack: # Library mode - embeds llama-stack as library use_as_library_client: true - library_client_config_path: run.yaml + # Unified mode: run.yaml (materialized per provider by CI/the harness) + # is consumed as the synthesis profile instead of the legacy two-file path. + config: + profile: run.yaml user_data_collection: feedback_enabled: true feedback_storage: "/tmp/data/feedback" diff --git a/tests/e2e/configuration/library-mode/lightspeed-stack-mcp.yaml b/tests/e2e/configuration/library-mode/lightspeed-stack-mcp.yaml index 5d9588bdb..ecb71cf23 100644 --- a/tests/e2e/configuration/library-mode/lightspeed-stack-mcp.yaml +++ b/tests/e2e/configuration/library-mode/lightspeed-stack-mcp.yaml @@ -9,7 +9,10 @@ service: llama_stack: # Library mode - embeds llama-stack as library use_as_library_client: true - library_client_config_path: run.yaml + # Unified mode: run.yaml (materialized per provider by CI/the harness) + # is consumed as the synthesis profile instead of the legacy two-file path. + config: + profile: run.yaml user_data_collection: feedback_enabled: true feedback_storage: "/tmp/data/feedback" diff --git a/tests/e2e/configuration/library-mode/lightspeed-stack-no-cache.yaml b/tests/e2e/configuration/library-mode/lightspeed-stack-no-cache.yaml index d54a8ab52..464770f41 100644 --- a/tests/e2e/configuration/library-mode/lightspeed-stack-no-cache.yaml +++ b/tests/e2e/configuration/library-mode/lightspeed-stack-no-cache.yaml @@ -8,7 +8,10 @@ service: access_log: true llama_stack: use_as_library_client: true - library_client_config_path: run.yaml + # Unified mode: run.yaml (materialized per provider by CI/the harness) + # is consumed as the synthesis profile instead of the legacy two-file path. + config: + profile: run.yaml user_data_collection: feedback_enabled: true feedback_storage: "/tmp/data/feedback" diff --git a/tests/e2e/configuration/library-mode/lightspeed-stack-rbac.yaml b/tests/e2e/configuration/library-mode/lightspeed-stack-rbac.yaml index ab03e7904..4461d60f5 100644 --- a/tests/e2e/configuration/library-mode/lightspeed-stack-rbac.yaml +++ b/tests/e2e/configuration/library-mode/lightspeed-stack-rbac.yaml @@ -9,7 +9,10 @@ service: llama_stack: use_as_library_client: true - library_client_config_path: run.yaml + # Unified mode: run.yaml (materialized per provider by CI/the harness) + # is consumed as the synthesis profile instead of the legacy two-file path. + config: + profile: run.yaml user_data_collection: feedback_enabled: true diff --git a/tests/e2e/configuration/library-mode/lightspeed-stack-skills-directory.yaml b/tests/e2e/configuration/library-mode/lightspeed-stack-skills-directory.yaml index 0aff2f67b..a6c9c5cb8 100644 --- a/tests/e2e/configuration/library-mode/lightspeed-stack-skills-directory.yaml +++ b/tests/e2e/configuration/library-mode/lightspeed-stack-skills-directory.yaml @@ -9,7 +9,10 @@ service: llama_stack: # Library mode - embeds llama-stack as library use_as_library_client: true - library_client_config_path: run.yaml + # Unified mode: run.yaml (materialized per provider by CI/the harness) + # is consumed as the synthesis profile instead of the legacy two-file path. + config: + profile: run.yaml user_data_collection: feedback_enabled: true feedback_storage: "/tmp/data/feedback" diff --git a/tests/e2e/configuration/library-mode/lightspeed-stack-skills.yaml b/tests/e2e/configuration/library-mode/lightspeed-stack-skills.yaml index 1a7177434..c35f56300 100644 --- a/tests/e2e/configuration/library-mode/lightspeed-stack-skills.yaml +++ b/tests/e2e/configuration/library-mode/lightspeed-stack-skills.yaml @@ -9,7 +9,10 @@ service: llama_stack: # Library mode - embeds llama-stack as library use_as_library_client: true - library_client_config_path: run.yaml + # Unified mode: run.yaml (materialized per provider by CI/the harness) + # is consumed as the synthesis profile instead of the legacy two-file path. + config: + profile: run.yaml user_data_collection: feedback_enabled: true feedback_storage: "/tmp/data/feedback" diff --git a/tests/e2e/configuration/library-mode/lightspeed-stack.yaml b/tests/e2e/configuration/library-mode/lightspeed-stack.yaml index 6c032de89..077b2e9ab 100644 --- a/tests/e2e/configuration/library-mode/lightspeed-stack.yaml +++ b/tests/e2e/configuration/library-mode/lightspeed-stack.yaml @@ -9,7 +9,10 @@ service: llama_stack: # Library mode - embeds llama-stack as library use_as_library_client: true - library_client_config_path: run.yaml + # Unified mode: run.yaml (materialized per provider by CI/the harness) + # is consumed as the synthesis profile instead of the legacy two-file path. + config: + profile: run.yaml user_data_collection: feedback_enabled: true feedback_storage: "/tmp/data/feedback"