Replace static initalization block in BaseOllamaIT

The static block was introducing side effects when doing scans of classpath
for AOT and seems to have been the cause of a failing test.

Updated github actions to use ~/.testcontainers.properties to enable
container resuse

Signed-off-by: leijendary <[email protected]>

Author: markpollack

.github/workflows/continuous-integration.yml

@@ -25,6 +25,10 @@ jobs:
           distribution: 'temurin'
           cache: 'maven'
 
+      - name: Configure Testcontainers
+        run: |
+          echo "testcontainers.reuse.enable=true" > $HOME/.testcontainers.properties
+
       # - name: Cache Docker images.
       #   uses: ScribeMD/[email protected]
       #   with:

spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/ollama/BaseOllamaIT.java

@@ -16,6 +16,8 @@
 
 package org.springframework.ai.autoconfigure.ollama;
 
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
 import org.testcontainers.ollama.OllamaContainer;
 
 import java.time.Duration;
@@ -27,11 +29,26 @@
 
 public class BaseOllamaIT {
 
-	public static final OllamaContainer ollamaContainer;
+	private static OllamaContainer ollamaContainer;
 
 	// Toggle for running tests locally on native Ollama for a faster feedback loop.
 	private static final boolean useTestcontainers = true;
 
+	@BeforeAll
+	public static void setUp() {
+		if (useTestcontainers && !isDisabled()) {
+			ollamaContainer = new OllamaContainer(OllamaImage.IMAGE).withReuse(true);
+			ollamaContainer.start();
+		}
+	}
+
+	@AfterAll
+	public static void tearDown() {
+		if (ollamaContainer != null) {
+			ollamaContainer.stop();
+		}
+	}
+
 	/**
 	 * Change the return value to false in order to run multiple Ollama IT tests locally
 	 * reusing the same container image.
@@ -61,9 +78,4 @@ public static String buildConnectionWithModel(String model) {
 		return baseUrl;
 	}
 
-	static {
-		ollamaContainer = new OllamaContainer(OllamaImage.IMAGE).withReuse(true);
-		ollamaContainer.start();
-	}
-
 }