Merge pull request #2398 from asamal4/OLS-1497d

enable periodic & rag  tool calling e2e

Author: openshift-merge-bot[bot]

tests/e2e/test_query_endpoint.py

@@ -196,6 +196,7 @@ def test_too_long_question() -> None:
         assert json_response["detail"]["response"] == "Prompt is too long"
 
 
+@pytest.mark.introspection
 @pytest.mark.smoketest
 @pytest.mark.rag
 def test_valid_question() -> None:
@@ -347,6 +348,7 @@ def test_token_counters_for_query_call_with_improper_payload() -> None:
         response_utils.check_content_type(response, "application/json")
 
 
+@pytest.mark.introspection
 @pytest.mark.rag
 @retry(max_attempts=3, wait_between_runs=10)
 def test_rag_question() -> None:

tests/scripts/test-e2e-cluster-periodics.sh

@@ -62,17 +62,14 @@ function run_suites() {
   run_suite "model_eval" "model_evaluation" "watsonx" "$WATSONX_PROVIDER_KEY_PATH" "ibm/granite-3-8b-instruct" "$OLS_IMAGE" "n"
   (( rc = rc || $? ))
 
-  # TODO: Enable below test cases once flag is added to operator CRD. Update flag name in CRD yaml (if different name is used)
   # TODO: Reduce execution time. Sequential execution will take more time. Parallel execution will have cluster claim issue.
   # Run tool calling - Enable introspection
-  # run_suite "azure_openai_introspection" "introspection" "azure_openai" "$AZUREOPENAI_PROVIDER_KEY_PATH" "gpt-4o-mini" "$OLS_IMAGE" "y"
-  # (( rc = rc || $? ))
-
-  # run_suite "openai_introspection" "introspection" "openai" "$OPENAI_PROVIDER_KEY_PATH" "gpt-4o-mini" "$OLS_IMAGE" "y"
-  # (( rc = rc || $? ))
-
-  # run_suite "watsonx_introspection" "introspection" "watsonx" "$WATSONX_PROVIDER_KEY_PATH" "ibm/granite-3-8b-instruct" "$OLS_IMAGE" "y"
-  # (( rc = rc || $? ))
+  run_suite "azure_openai_introspection" "introspection" "azure_openai" "$AZUREOPENAI_PROVIDER_KEY_PATH" "gpt-4o-mini" "$OLS_IMAGE" "y"
+  (( rc = rc || $? ))
+  run_suite "openai_introspection" "introspection" "openai" "$OPENAI_PROVIDER_KEY_PATH" "gpt-4o-mini" "$OLS_IMAGE" "y"
+  (( rc = rc || $? ))
+  run_suite "watsonx_introspection" "introspection" "watsonx" "$WATSONX_PROVIDER_KEY_PATH" "ibm/granite-3-2-8b-instruct" "$OLS_IMAGE" "y"
+  (( rc = rc || $? ))
 
   set -e