From 010281b29c0f22ed9b10a3a2f8253e83ee04d1b5 Mon Sep 17 00:00:00 2001
From: are-ces <195810094+are-ces@users.noreply.github.com>
Date: Tue, 25 Nov 2025 14:14:13 +0100
Subject: [PATCH] Parametrizing the e2e test model

---
 .github/workflows/e2e_tests.yaml | 6 ++----
 docker-compose.yaml              | 1 +
 tests/e2e/configs/run-ci.yaml    | 6 +++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/e2e_tests.yaml b/.github/workflows/e2e_tests.yaml
index 48f3c17de..e34b0cf5d 100644
--- a/.github/workflows/e2e_tests.yaml
+++ b/.github/workflows/e2e_tests.yaml
@@ -12,6 +12,7 @@ jobs:
         environment: [ "ci", "azure"]
     env:
       OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
+      E2E_OPENAI_MODEL: ${{ vars.E2E_OPENAI_MODEL }}
       CLIENT_SECRET: ${{ secrets.CLIENT_SECRET }}
       CLIENT_ID: ${{ secrets.CLIENT_ID }}
       TENANT_ID: ${{ secrets.TENANT_ID }}
@@ -139,10 +140,7 @@ jobs:
           # Update paths for container environment (relative -> absolute)
           sed -i 's|db_path: \.llama/distributions|db_path: /app-root/.llama/distributions|g' run.yaml
           sed -i 's|db_path: tmp/|db_path: /app-root/.llama/distributions/|g' run.yaml
-          
-          # Set OpenAI API key for container
-          sed -i "s|api_key: \${env\.OPENAI_API_KEY}|api_key: $OPENAI_API_KEY|g" run.yaml
-          
+                    
           echo "Successfully configured for environment: $ENVIRONMENT"
           echo "Using configuration: $(basename "$CONFIG_FILE")"
 
diff --git a/docker-compose.yaml b/docker-compose.yaml
index ad7fb6b3e..00b76dede 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -12,6 +12,7 @@ services:
       - ./run.yaml:/opt/app-root/run.yaml:Z
     environment:
       - OPENAI_API_KEY=${OPENAI_API_KEY}
+      - E2E_OPENAI_MODEL=${E2E_OPENAI_MODEL}
       - AZURE_API_KEY=${AZURE_API_KEY}
       - BRAVE_SEARCH_API_KEY=${BRAVE_SEARCH_API_KEY:-}
       - TAVILY_SEARCH_API_KEY=${TAVILY_SEARCH_API_KEY:-}
diff --git a/tests/e2e/configs/run-ci.yaml b/tests/e2e/configs/run-ci.yaml
index 4b53da36d..d532c50ea 100644
--- a/tests/e2e/configs/run-ci.yaml
+++ b/tests/e2e/configs/run-ci.yaml
@@ -134,7 +134,7 @@ server:
 shields: 
   - shield_id: llama-guard-shield
     provider_id: llama-guard
-    provider_shield_id: "gpt-4-turbo"
+    provider_shield_id: ${env.E2E_OPENAI_MODEL}
 vector_dbs:
   - vector_db_id: my_knowledge_base
     embedding_model: sentence-transformers/all-mpnet-base-v2
@@ -147,10 +147,10 @@ models:
     provider_id: sentence-transformers
     provider_model_id: sentence-transformers/all-mpnet-base-v2 # Location of embedding model
     model_type: embedding
-  - model_id: gpt-4-turbo
+  - model_id: ${env.E2E_OPENAI_MODEL}
     provider_id: openai
     model_type: llm
-    provider_model_id: gpt-4-turbo
+    provider_model_id: ${env.E2E_OPENAI_MODEL}
 
 tool_groups:
   - toolgroup_id: builtin::rag