Skip to content

Commit ad8a07a

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #696 from JoaoFula/add-different-operators-operator-tests
OLS-1637 - Adding entraid tests
2 parents 04b1ec1 + 14f4617 commit ad8a07a

9 files changed

+409
-52
lines changed

‎.tekton/integration-tests/pipelines/lightspeed-complete-e2e-tests-pipeline-415.yaml

Lines changed: 45 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,21 @@ spec:
195195
params:
196196
- name: commit
197197
volumes:
198+
- name: azure-openai-token
199+
secret:
200+
secretName: azureopenai-apitoken
201+
- name: azureopenai-entra-id
202+
secret:
203+
secretName: azureopenai-entra-id
204+
- name: bam-token
205+
secret:
206+
secretName: bam-apitoken
198207
- name: openai-token
199208
secret:
200209
secretName: openai
210+
- name: watsonx-token
211+
secret:
212+
secretName: watsonx-apitoken
201213
- name: credentials
202214
emptyDir: {}
203215
- name: ols-konflux-artifacts-bot-creds
@@ -224,23 +236,54 @@ spec:
224236
- name: run-e2e-tests
225237
onError: continue
226238
volumeMounts:
239+
- name: azure-openai-token
240+
mountPath: /var/run/azure_openai
241+
- name: azureopenai-entra-id
242+
mountPath: /var/run/azureopenai-entra-id
243+
- name: bam-token
244+
mountPath: /var/run/bam
227245
- name: openai-token
228246
mountPath: /var/run/openai
247+
- name: watsonx-token
248+
mountPath: /var/run/watsonx
229249
- name: credentials
230250
mountPath: /credentials
231251
env:
232252
- name: KUBECONFIG
233253
value: "/credentials/$(steps.get-kubeconfig.results.kubeconfig)"
234-
- name: LLM_TOKEN_PATH
254+
- name: BAM_PROVIDER_KEY_PATH
255+
value: "/var/run/bam/token"
256+
- name: AZUREOPENAI_PROVIDER_KEY_PATH
257+
value: "/var/run/azure_openai/token"
258+
- name: OPENAI_PROVIDER_KEY_PATH
235259
value: "/var/run/openai/token"
260+
- name: WATSONX_PROVIDER_KEY_PATH
261+
value: "/var/run/watsonx/token"
236262
image: registry.redhat.io/openshift4/ose-cli:latest
237263
script: |
238264
echo "---------------------------------------------"
239-
export LLM_TOKEN=$(cat ${LLM_TOKEN_PATH})
240265
dnf -y install git make golang
241266
git clone https://github.com/openshift/lightspeed-operator.git
242267
cd lightspeed-operator
243268
echo "---------------------------------------------"
269+
echo "starting tests for openai"
270+
export LLM_TOKEN=$(cat ${OPENAI_PROVIDER_KEY_PATH})
271+
export LLMProviderEnvVar="openai"
272+
export llmModel="gpt-4o-mini"
273+
make test-e2e
274+
echo "---------------------------------------------"
275+
echo "starting tests for watsonx"
276+
export LLM_TOKEN=$(cat ${WATSONX_PROVIDER_KEY_PATH})
277+
export LLMProviderEnvVar="watsonx"
278+
export llmModel="ibm/granite-3-8b-instruct"
279+
echo "---------------------------------------------"
280+
echo "starting tests for azure_openai"
281+
export AZUREOPENAI_ENTRA_ID_TENANT_ID="$(cat /var/run/azureopenai-entra-id/tenant_id)"
282+
export AZUREOPENAI_ENTRA_ID_CLIENT_ID="$(cat /var/run/azureopenai-entra-id/client_id)"
283+
export AZUREOPENAI_ENTRA_ID_CLIENT_SECRET="$(cat /var/run/azureopenai-entra-id/client_secret)"
284+
export LLM_TOKEN=$(cat ${AZUREOPENAI_PROVIDER_KEY_PATH})
285+
export LLMProviderEnvVar="azure_openai"
286+
export llmModel="gpt-4o-mini"
244287
make test-e2e
245288
- name: gather-cluster-resources
246289
ref:

‎.tekton/integration-tests/pipelines/lightspeed-complete-e2e-tests-pipeline-416.yaml

Lines changed: 45 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,21 @@ spec:
195195
params:
196196
- name: commit
197197
volumes:
198+
- name: azure-openai-token
199+
secret:
200+
secretName: azureopenai-apitoken
201+
- name: azureopenai-entra-id
202+
secret:
203+
secretName: azureopenai-entra-id
204+
- name: bam-token
205+
secret:
206+
secretName: bam-apitoken
198207
- name: openai-token
199208
secret:
200209
secretName: openai
210+
- name: watsonx-token
211+
secret:
212+
secretName: watsonx-apitoken
201213
- name: credentials
202214
emptyDir: {}
203215
- name: ols-konflux-artifacts-bot-creds
@@ -224,23 +236,54 @@ spec:
224236
- name: run-e2e-tests
225237
onError: continue
226238
volumeMounts:
239+
- name: azure-openai-token
240+
mountPath: /var/run/azure_openai
241+
- name: azureopenai-entra-id
242+
mountPath: /var/run/azureopenai-entra-id
243+
- name: bam-token
244+
mountPath: /var/run/bam
227245
- name: openai-token
228246
mountPath: /var/run/openai
247+
- name: watsonx-token
248+
mountPath: /var/run/watsonx
229249
- name: credentials
230250
mountPath: /credentials
231251
env:
232252
- name: KUBECONFIG
233253
value: "/credentials/$(steps.get-kubeconfig.results.kubeconfig)"
234-
- name: LLM_TOKEN_PATH
254+
- name: BAM_PROVIDER_KEY_PATH
255+
value: "/var/run/bam/token"
256+
- name: AZUREOPENAI_PROVIDER_KEY_PATH
257+
value: "/var/run/azure_openai/token"
258+
- name: OPENAI_PROVIDER_KEY_PATH
235259
value: "/var/run/openai/token"
260+
- name: WATSONX_PROVIDER_KEY_PATH
261+
value: "/var/run/watsonx/token"
236262
image: registry.redhat.io/openshift4/ose-cli:latest
237263
script: |
238264
echo "---------------------------------------------"
239-
export LLM_TOKEN=$(cat ${LLM_TOKEN_PATH})
240265
dnf -y install git make golang
241266
git clone https://github.com/openshift/lightspeed-operator.git
242267
cd lightspeed-operator
243268
echo "---------------------------------------------"
269+
echo "starting tests for openai"
270+
export LLM_TOKEN=$(cat ${OPENAI_PROVIDER_KEY_PATH})
271+
export LLMProviderEnvVar="openai"
272+
export llmModel="gpt-4o-mini"
273+
make test-e2e
274+
echo "---------------------------------------------"
275+
echo "starting tests for watsonx"
276+
export LLM_TOKEN=$(cat ${WATSONX_PROVIDER_KEY_PATH})
277+
export LLMProviderEnvVar="watsonx"
278+
export llmModel="ibm/granite-3-8b-instruct"
279+
echo "---------------------------------------------"
280+
echo "starting tests for azure_openai"
281+
export AZUREOPENAI_ENTRA_ID_TENANT_ID="$(cat /var/run/azureopenai-entra-id/tenant_id)"
282+
export AZUREOPENAI_ENTRA_ID_CLIENT_ID="$(cat /var/run/azureopenai-entra-id/client_id)"
283+
export AZUREOPENAI_ENTRA_ID_CLIENT_SECRET="$(cat /var/run/azureopenai-entra-id/client_secret)"
284+
export LLM_TOKEN=$(cat ${AZUREOPENAI_PROVIDER_KEY_PATH})
285+
export LLMProviderEnvVar="azure_openai"
286+
export llmModel="gpt-4o-mini"
244287
make test-e2e
245288
- name: gather-cluster-resources
246289
ref:

‎.tekton/integration-tests/pipelines/lightspeed-complete-e2e-tests-pipeline-417.yaml

Lines changed: 45 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,21 @@ spec:
195195
params:
196196
- name: commit
197197
volumes:
198+
- name: azure-openai-token
199+
secret:
200+
secretName: azureopenai-apitoken
201+
- name: azureopenai-entra-id
202+
secret:
203+
secretName: azureopenai-entra-id
204+
- name: bam-token
205+
secret:
206+
secretName: bam-apitoken
198207
- name: openai-token
199208
secret:
200209
secretName: openai
210+
- name: watsonx-token
211+
secret:
212+
secretName: watsonx-apitoken
201213
- name: credentials
202214
emptyDir: {}
203215
- name: ols-konflux-artifacts-bot-creds
@@ -224,23 +236,54 @@ spec:
224236
- name: run-e2e-tests
225237
onError: continue
226238
volumeMounts:
239+
- name: azure-openai-token
240+
mountPath: /var/run/azure_openai
241+
- name: azureopenai-entra-id
242+
mountPath: /var/run/azureopenai-entra-id
243+
- name: bam-token
244+
mountPath: /var/run/bam
227245
- name: openai-token
228246
mountPath: /var/run/openai
247+
- name: watsonx-token
248+
mountPath: /var/run/watsonx
229249
- name: credentials
230250
mountPath: /credentials
231251
env:
232252
- name: KUBECONFIG
233253
value: "/credentials/$(steps.get-kubeconfig.results.kubeconfig)"
234-
- name: LLM_TOKEN_PATH
254+
- name: BAM_PROVIDER_KEY_PATH
255+
value: "/var/run/bam/token"
256+
- name: AZUREOPENAI_PROVIDER_KEY_PATH
257+
value: "/var/run/azure_openai/token"
258+
- name: OPENAI_PROVIDER_KEY_PATH
235259
value: "/var/run/openai/token"
260+
- name: WATSONX_PROVIDER_KEY_PATH
261+
value: "/var/run/watsonx/token"
236262
image: registry.redhat.io/openshift4/ose-cli:latest
237263
script: |
238264
echo "---------------------------------------------"
239-
export LLM_TOKEN=$(cat ${LLM_TOKEN_PATH})
240265
dnf -y install git make golang
241266
git clone https://github.com/openshift/lightspeed-operator.git
242267
cd lightspeed-operator
243268
echo "---------------------------------------------"
269+
echo "starting tests for openai"
270+
export LLM_TOKEN=$(cat ${OPENAI_PROVIDER_KEY_PATH})
271+
export LLMProviderEnvVar="openai"
272+
export llmModel="gpt-4o-mini"
273+
make test-e2e
274+
echo "---------------------------------------------"
275+
echo "starting tests for watsonx"
276+
export LLM_TOKEN=$(cat ${WATSONX_PROVIDER_KEY_PATH})
277+
export LLMProviderEnvVar="watsonx"
278+
export llmModel="ibm/granite-3-8b-instruct"
279+
echo "---------------------------------------------"
280+
echo "starting tests for azure_openai"
281+
export AZUREOPENAI_ENTRA_ID_TENANT_ID="$(cat /var/run/azureopenai-entra-id/tenant_id)"
282+
export AZUREOPENAI_ENTRA_ID_CLIENT_ID="$(cat /var/run/azureopenai-entra-id/client_id)"
283+
export AZUREOPENAI_ENTRA_ID_CLIENT_SECRET="$(cat /var/run/azureopenai-entra-id/client_secret)"
284+
export LLM_TOKEN=$(cat ${AZUREOPENAI_PROVIDER_KEY_PATH})
285+
export LLMProviderEnvVar="azure_openai"
286+
export llmModel="gpt-4o-mini"
244287
make test-e2e
245288
- name: gather-cluster-resources
246289
ref:

‎.tekton/integration-tests/pipelines/lightspeed-operator-e2e-test-pipeline-415.yaml

Lines changed: 51 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,21 @@ spec:
195195
params:
196196
- name: commit
197197
volumes:
198+
- name: azure-openai-token
199+
secret:
200+
secretName: azureopenai-apitoken
201+
- name: azureopenai-entra-id
202+
secret:
203+
secretName: azureopenai-entra-id
204+
- name: bam-token
205+
secret:
206+
secretName: bam-apitoken
198207
- name: openai-token
199208
secret:
200209
secretName: openai
210+
- name: watsonx-token
211+
secret:
212+
secretName: watsonx-apitoken
201213
- name: credentials
202214
emptyDir: {}
203215
- name: ols-konflux-artifacts-bot-creds
@@ -224,23 +236,60 @@ spec:
224236
- name: run-e2e-tests
225237
onError: continue
226238
volumeMounts:
239+
- name: azure-openai-token
240+
mountPath: /var/run/azure_openai
241+
- name: azureopenai-entra-id
242+
mountPath: /var/run/azureopenai-entra-id
243+
- name: bam-token
244+
mountPath: /var/run/bam
227245
- name: openai-token
228246
mountPath: /var/run/openai
247+
- name: watsonx-token
248+
mountPath: /var/run/watsonx
229249
- name: credentials
230250
mountPath: /credentials
231251
env:
232252
- name: KUBECONFIG
233253
value: "/credentials/$(steps.get-kubeconfig.results.kubeconfig)"
234-
- name: LLM_TOKEN_PATH
254+
- name: BAM_PROVIDER_KEY_PATH
255+
value: "/var/run/bam/token"
256+
- name: AZUREOPENAI_PROVIDER_KEY_PATH
257+
value: "/var/run/azure_openai/token"
258+
- name: OPENAI_PROVIDER_KEY_PATH
235259
value: "/var/run/openai/token"
260+
- name: WATSONX_PROVIDER_KEY_PATH
261+
value: "/var/run/watsonx/token"
262+
- name: COMMIT_SHA
263+
value: "$(params.commit)"
236264
image: registry.redhat.io/openshift4/ose-cli:latest
237265
script: |
238266
echo "---------------------------------------------"
239-
export LLM_TOKEN=$(cat ${LLM_TOKEN_PATH})
267+
cat $KUBECONFIG
268+
echo "---------------------------------------------"
240269
dnf -y install git make golang
241270
git clone https://github.com/openshift/lightspeed-operator.git
242271
cd lightspeed-operator
272+
git config --global user.email [email protected]
273+
git config --global user.name olsci
274+
git pull origin ${COMMIT_SHA} --rebase
275+
echo "---------------------------------------------"
276+
echo "---------------------------------------------"
277+
echo "---------------------------------------------"
278+
export LLM_TOKEN=$(cat ${OPENAI_PROVIDER_KEY_PATH})
279+
export LLM_PROVIDER="openai"
280+
export LLM_MODEL="gpt-4o-mini"
281+
echo "starting tests for $LLM_PROVIDER $LLM_MODEL"
282+
make test-e2e
283+
echo "---------------------------------------------"
284+
echo "---------------------------------------------"
243285
echo "---------------------------------------------"
286+
export AZUREOPENAI_ENTRA_ID_TENANT_ID="$(cat /var/run/azureopenai-entra-id/tenant_id)"
287+
export AZUREOPENAI_ENTRA_ID_CLIENT_ID="$(cat /var/run/azureopenai-entra-id/client_id)"
288+
export AZUREOPENAI_ENTRA_ID_CLIENT_SECRET="$(cat /var/run/azureopenai-entra-id/client_secret)"
289+
export LLM_TOKEN=$(cat ${AZUREOPENAI_PROVIDER_KEY_PATH})
290+
export LLM_PROVIDER="azure_openai"
291+
export LLM_MODEL="gpt-4o-mini"
292+
echo "starting tests for $LLM_PROVIDER $LLM_MODEL"
244293
make test-e2e
245294
- name: gather-cluster-resources
246295
ref:

0 commit comments

Comments
 (0)