Skip to content

LCORE-1472: use single config set #1467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
radofuchs merged 5 commits into from
Apr 7, 2026
Merged

LCORE-1472: use single config set #1467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
aebdd41
LCORE-1472: use single config set
Apr 7, 2026
2c1007d
fix enrichment
Apr 7, 2026
11222b3
Merge branch 'main' into LCORE_1472_single_config_set
radofuchs Apr 7, 2026
1609027
run only single test to see logs
Apr 7, 2026
f141d7a
proper test fix
Apr 7, 2026
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
2 changes: 2 additions & 0 deletions .github/workflows/e2e_tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ jobs:
E2E_OPENAI_MODEL: ${{ vars.E2E_OPENAI_MODEL }}
E2E_DEPLOYMENT_MODE: ${{ matrix.mode }}
FAISS_VECTOR_STORE_ID: ${{ vars.FAISS_VECTOR_STORE_ID }}
# Override via repo Actions variable E2E_LLAMA_HOSTNAME; default matches server-mode lightspeed-stack.yaml
E2E_LLAMA_HOSTNAME: ${{ vars.E2E_LLAMA_HOSTNAME || 'llama-stack' }}

steps:
- uses: actions/checkout@v4
Expand Down
5 changes: 5 additions & 0 deletions docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ services:
- LLAMA_STACK_LOGGING=${LLAMA_STACK_LOGGING:-}
# FAISS test
- FAISS_VECTOR_STORE_ID=${FAISS_VECTOR_STORE_ID:-}
#required for enrichment
- E2E_LLAMA_HOSTNAME=${E2E_LLAMA_HOSTNAME:-llama-stack}
networks:
- lightspeednet
healthcheck:
Expand Down Expand Up @@ -98,6 +100,9 @@ services:
- CLIENT_SECRET=${CLIENT_SECRET:-}
# FAISS vector store ID (used by inline RAG config)
- FAISS_VECTOR_STORE_ID=${FAISS_VECTOR_STORE_ID:-}
# Substituted in mounted lightspeed-stack.yaml (llama_stack.url); GitHub Actions sets via vars
- E2E_LLAMA_HOSTNAME=${E2E_LLAMA_HOSTNAME:-llama-stack}
- E2E_LLAMA_PORT=${E2E_LLAMA_PORT:-8321}
Comment on lines +103 to +105

@coderabbitai coderabbitai Bot Apr 7, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

E2E_LLAMA_PORT is not wired through the mounted YAML yet.

The shared lightspeed-stack*.yaml files still build llama_stack.url as http://${env.E2E_LLAMA_HOSTNAME}:8321, so overriding E2E_LLAMA_PORT here only changes the helper clients, not the app's upstream endpoint. Either substitute ${env.E2E_LLAMA_PORT} in those YAMLs as well or drop this env until the override is supported end-to-end.

🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In `@docker-compose.yaml` around lines 101 - 103, The docker-compose env
E2E_LLAMA_PORT is being set but the mounted lightspeed-stack*.yaml still
hardcodes llama_stack.url to use port 8321; update the lightspeed-stack*.yaml
templates to interpolate the port (e.g. use ${env.E2E_LLAMA_PORT} when
constructing llama_stack.url) so the app's upstream endpoint and the helper
clients use the same port, or remove E2E_LLAMA_PORT from docker-compose until
you add that substitution; look for the llama_stack.url key in the
lightspeed-stack.yaml files and replace the literal :8321 with an environment
variable reference matching E2E_LLAMA_PORT.

depends_on:
llama-stack:
condition: service_healthy
Expand Down
9 changes: 1 addition & 8 deletions docs/e2e_testing.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,14 +75,7 @@ tests/e2e-prow/
├── pipeline-services-konflux.sh # Services for Konflux (llama-stack-openai + templated LCS)
├── pipeline-vllm.sh # vLLM cluster setup (called from pipeline.sh)
├── pipeline-test-pod.sh # Test pod pipeline
├── configs/ # Lightspeed-stack configs for Prow (used by environment.py when is_prow)
│ ├── lightspeed-stack.yaml
│ ├── lightspeed-stack-auth-noop-token.yaml
│ ├── lightspeed-stack-rbac.yaml
│ ├── lightspeed-stack-auth-rh-identity.yaml
│ ├── lightspeed-stack-no-cache.yaml
│ ├── lightspeed-stack-invalid-feedback-storage.yaml
│ └── run.yaml # vLLM Llama Stack config (used by pipeline.sh); Konflux uses tests/e2e/configs/run-ci.yaml via pipeline-konflux.sh
├── configs/ # vLLM Llama Stack `run.yaml` (used by pipeline.sh for llama-stack-config)
├── scripts/
│ ├── e2e-ops.sh # E2E ops (e.g. disrupt/restore llama-stack) — called from prow_utils
│ ├── bootstrap.sh
Expand Down
31 changes: 0 additions & 31 deletions tests/e2e-prow/rhoai/configs/lightspeed-stack-auth-noop-token.yaml
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions tests/e2e-prow/rhoai/configs/lightspeed-stack-auth-rh-identity.yaml
View file
Open in desktop

This file was deleted.

38 changes: 0 additions & 38 deletions tests/e2e-prow/rhoai/configs/lightspeed-stack-inline-rag.yaml
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions tests/e2e-prow/rhoai/configs/lightspeed-stack-invalid-feedback-storage.yaml
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions tests/e2e-prow/rhoai/configs/lightspeed-stack-invalid-mcp-file-auth.yaml
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions tests/e2e-prow/rhoai/configs/lightspeed-stack-mcp-client-auth.yaml
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions tests/e2e-prow/rhoai/configs/lightspeed-stack-mcp-file-auth.yaml
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions tests/e2e-prow/rhoai/configs/lightspeed-stack-mcp-kubernetes-auth.yaml
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions tests/e2e-prow/rhoai/configs/lightspeed-stack-mcp-oauth-auth.yaml
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions tests/e2e-prow/rhoai/configs/lightspeed-stack-mcp.yaml
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions tests/e2e-prow/rhoai/configs/lightspeed-stack-no-cache.yaml
View file
Open in desktop

This file was deleted.

Loading
Loading