Skip to content

Commit 010281b

Browse files
committed
Parametrizing the e2e test model
1 parent 087655c commit 010281b

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

.github/workflows/e2e_tests.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ jobs:
1212
environment: [ "ci", "azure"]
1313
env:
1414
OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
15+
E2E_OPENAI_MODEL: ${{ vars.E2E_OPENAI_MODEL }}
1516
CLIENT_SECRET: ${{ secrets.CLIENT_SECRET }}
1617
CLIENT_ID: ${{ secrets.CLIENT_ID }}
1718
TENANT_ID: ${{ secrets.TENANT_ID }}
@@ -139,10 +140,7 @@ jobs:
139140
# Update paths for container environment (relative -> absolute)
140141
sed -i 's|db_path: \.llama/distributions|db_path: /app-root/.llama/distributions|g' run.yaml
141142
sed -i 's|db_path: tmp/|db_path: /app-root/.llama/distributions/|g' run.yaml
142-
143-
# Set OpenAI API key for container
144-
sed -i "s|api_key: \${env\.OPENAI_API_KEY}|api_key: $OPENAI_API_KEY|g" run.yaml
145-
143+
146144
echo "Successfully configured for environment: $ENVIRONMENT"
147145
echo "Using configuration: $(basename "$CONFIG_FILE")"
148146

docker-compose.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ services:
1212
- ./run.yaml:/opt/app-root/run.yaml:Z
1313
environment:
1414
- OPENAI_API_KEY=${OPENAI_API_KEY}
15+
- E2E_OPENAI_MODEL=${E2E_OPENAI_MODEL}
1516
- AZURE_API_KEY=${AZURE_API_KEY}
1617
- BRAVE_SEARCH_API_KEY=${BRAVE_SEARCH_API_KEY:-}
1718
- TAVILY_SEARCH_API_KEY=${TAVILY_SEARCH_API_KEY:-}

tests/e2e/configs/run-ci.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ server:
134134
shields:
135135
- shield_id: llama-guard-shield
136136
provider_id: llama-guard
137-
provider_shield_id: "gpt-4-turbo"
137+
provider_shield_id: ${env.E2E_OPENAI_MODEL}
138138
vector_dbs:
139139
- vector_db_id: my_knowledge_base
140140
embedding_model: sentence-transformers/all-mpnet-base-v2
@@ -147,10 +147,10 @@ models:
147147
provider_id: sentence-transformers
148148
provider_model_id: sentence-transformers/all-mpnet-base-v2 # Location of embedding model
149149
model_type: embedding
150-
- model_id: gpt-4-turbo
150+
- model_id: ${env.E2E_OPENAI_MODEL}
151151
provider_id: openai
152152
model_type: llm
153-
provider_model_id: gpt-4-turbo
153+
provider_model_id: ${env.E2E_OPENAI_MODEL}
154154

155155
tool_groups:
156156
- toolgroup_id: builtin::rag

0 commit comments

Comments
 (0)