From 4363c9576307c898645de302b9b997441197a45a Mon Sep 17 00:00:00 2001
From: Mark Pollack <mark.pollack@broadcom.com>
Date: Tue, 19 Nov 2024 15:13:44 -0500
Subject: [PATCH] Fix ollama IT execution

---
 .github/actions/do-integration-test/action.yml    | 6 +++++-
 .github/workflows/spring-ai-integration-tests.yml | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/actions/do-integration-test/action.yml b/.github/actions/do-integration-test/action.yml
index 248d7ec..926c795 100644
--- a/.github/actions/do-integration-test/action.yml
+++ b/.github/actions/do-integration-test/action.yml
@@ -5,6 +5,10 @@ inputs:
   model-name:
     description: "SpringAI Model to integration test"
     required: true
+  maven-properties:
+    description: "Maven properties to pass to the build (e.g., -Dskip.vectorstore.milvus=true -Dskip.vectorstore.neo4j=true)"
+    required: false
+    default: ""
 
 runs:
   using: "composite"
@@ -38,4 +42,4 @@ runs:
 
     - name: Run ${{ inputs.model-name }} model tests
       shell: bash
-      run: cd spring-ai && ./mvnw -pl models/spring-ai-${{ inputs.model-name }} -Pintegration-tests -Dfailsafe.rerunFailingTestsCount=2 verify
+      run: cd spring-ai && ./mvnw -pl models/spring-ai-${{ inputs.model-name }} -Pintegration-tests ${{ inputs.maven-properties }} -Dfailsafe.rerunFailingTestsCount=2 verify
diff --git a/.github/workflows/spring-ai-integration-tests.yml b/.github/workflows/spring-ai-integration-tests.yml
index 062017c..c0b087b 100644
--- a/.github/workflows/spring-ai-integration-tests.yml
+++ b/.github/workflows/spring-ai-integration-tests.yml
@@ -16,7 +16,6 @@ jobs:
         ports:
           - 11434:11434
     env:
-      OLLAMA_TESTS_ENABLED: true
       OLLAMA_WITH_REUSE: true
     steps:
       - name: Checkout the action
@@ -37,6 +36,7 @@ jobs:
         uses: ./.github/actions/do-integration-test
         with:
           model-name: ollama
+          maven-properties: "-Dskip.model.ollama=false"
 
 # Anthrohpic is overloaded :(
 #