Fix E2E, add config swap for no-MCP-servers tests

Assisted-by: Claude Opus 4.6

Generated-by: Cursor
Signed-off-by: Maysun J Faisal <maysunaneek@gmail.com>

Author: maysunfaisal

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

@@ -0,0 +1,19 @@
+name: Lightspeed Core Service (LCS)
+service:
+  host: 0.0.0.0
+  port: 8080
+  auth_enabled: false
+  workers: 1
+  color_log: true
+  access_log: true
+llama_stack:
+  # Library mode - embeds llama-stack as library
+  use_as_library_client: true
+  library_client_config_path: run.yaml
+user_data_collection:
+  feedback_enabled: true
+  feedback_storage: "/tmp/data/feedback"
+  transcripts_enabled: true
+  transcripts_storage: "/tmp/data/transcripts"
+authentication:
+  module: "noop"

tests/e2e/configuration/server-mode/lightspeed-stack-no-mcp.yaml

@@ -0,0 +1,20 @@
+name: Lightspeed Core Service (LCS)
+service:
+  host: 0.0.0.0
+  port: 8080
+  auth_enabled: false
+  workers: 1
+  color_log: true
+  access_log: true
+llama_stack:
+  # Server mode - connects to separate llama-stack service
+  use_as_library_client: false
+  url: http://llama-stack:8321
+  api_key: xyzzy
+user_data_collection:
+  feedback_enabled: true
+  feedback_storage: "/tmp/data/feedback"
+  transcripts_enabled: true
+  transcripts_storage: "/tmp/data/transcripts"
+authentication:
+  module: "noop"

tests/e2e/features/environment.py

@@ -80,6 +80,10 @@
         "tests/e2e/configuration/{mode_dir}/lightspeed-stack-mcp-auth.yaml",
         "tests/e2e-prow/rhoai/configs/lightspeed-stack-mcp-auth.yaml",
     ),
+    "no-mcp": (
+        "tests/e2e/configuration/{mode_dir}/lightspeed-stack-no-mcp.yaml",
+        "tests/e2e-prow/rhoai/configs/lightspeed-stack-no-mcp.yaml",
+    ),
 }
 
 
@@ -451,6 +455,12 @@ def before_feature(context: Context, feature: Feature) -> None:
         switch_config(context.feature_config)
         restart_container("lightspeed-stack")
 
+    if "MCPNoConfig" in feature.tags:
+        context.feature_config = _get_config_path("no-mcp", mode_dir)
+        context.default_config_backup = create_config_backup("lightspeed-stack.yaml")
+        switch_config(context.feature_config)
+        restart_container("lightspeed-stack")
+
 
 def after_feature(context: Context, feature: Feature) -> None:
     """Run after each feature file is exercised.
@@ -493,3 +503,8 @@ def after_feature(context: Context, feature: Feature) -> None:
         switch_config(context.default_config_backup)
         restart_container("lightspeed-stack")
         remove_config_backup(context.default_config_backup)
+
+    if "MCPNoConfig" in feature.tags:
+        switch_config(context.default_config_backup)
+        restart_container("lightspeed-stack")
+        remove_config_backup(context.default_config_backup)

tests/e2e/features/mcp_servers_api_no_config.feature

@@ -1,3 +1,4 @@
+@MCPNoConfig
 Feature: MCP Server API tests without configured MCP servers
 
   Tests that the MCP server management endpoints work correctly