Merge 0f4790f531 into 4237eb4aaa

tests/integration/README.md

@@ -25,7 +25,7 @@ Here are the most important options:
   - **`server:<config>`** - automatically start a server with the given config (e.g., `server:starter`). This provides one-step testing by auto-starting the server if the port is available, or reusing an existing server if already running.
   - **`server:<config>:<port>`** - same as above but with a custom port (e.g., `server:starter:8322`)
   - a URL which points to a Llama Stack distribution server
-  - a distribution name (e.g., `starter`) or a path to a `run.yaml` file
+  - a distribution name (e.g., `starter`) or a path to a `config.yaml` file
   - a comma-separated list of api=provider pairs, e.g. `inference=ollama,safety=llama-guard,agents=meta-reference`. This is most useful for testing a single API surface.
 - `--env`: set environment variables, e.g. --env KEY=value. this is a utility option to set environment variables required by various providers.
 

tests/integration/conftest.py

@@ -151,7 +151,7 @@ def pytest_addoption(parser):
             """
             a 'pointer' to the stack. this can be either be:
             (a) a template name like `starter`, or
-            (b) a path to a run.yaml file, or
+            (b) a path to a config.yaml file, or
             (c) an adhoc config spec, e.g. `inference=fireworks,safety=llama-guard,agents=meta-reference`, or
             (d) a server config like `server:ci-tests`, or
             (e) a docker config like `docker:ci-tests` (builds and runs container)

tests/integration/test_persistence_integration.py

@@ -6,7 +6,7 @@
 
 import yaml
 
-from llama_stack.core.datatypes import StackRunConfig
+from llama_stack.core.datatypes import StackConfig
 from llama_stack.core.storage.datatypes import (
     PostgresKVStoreConfig,
     PostgresSqlStoreConfig,
@@ -17,10 +17,10 @@ from llama_stack.core.storage.datatypes import (
 
 def test_starter_distribution_config_loads_and_resolves():
     """Integration: Actual starter config should parse and have correct storage structure."""
-    with open("llama_stack/distributions/starter/run.yaml") as f:
+    with open("llama_stack/distributions/starter/config.yaml") as f:
         config_dict = yaml.safe_load(f)
 
-    config = StackRunConfig(**config_dict)
+    config = StackConfig(**config_dict)
 
     # Config should have named backends and explicit store references
     assert config.storage is not None
@@ -47,10 +47,10 @@ def test_starter_distribution_config_loads_and_resolves():
 
 def test_postgres_demo_distribution_config_loads():
     """Integration: Postgres demo should use Postgres backend for all stores."""
-    with open("llama_stack/distributions/postgres-demo/run.yaml") as f:
+    with open("llama_stack/distributions/postgres-demo/config.yaml") as f:
         config_dict = yaml.safe_load(f)
 
-    config = StackRunConfig(**config_dict)
+    config = StackConfig(**config_dict)
 
     # Should have postgres backend
     assert config.storage is not None