Add test retries

buildSrc/build.gradle.kts

@@ -13,4 +13,5 @@ dependencies {
     implementation("gradle.plugin.com.google.gradle:osdetector-gradle-plugin:1.7.3")
     implementation("de.thetaphi:forbiddenapis:3.8")
     implementation("com.github.spotbugs.snom:spotbugs-gradle-plugin:6.1.0")
+    implementation("org.gradle:test-retry-gradle-plugin:1.6.1")
 }

buildSrc/src/main/kotlin/sb-ot-demo.java-conventions.gradle.kts

@@ -18,6 +18,7 @@ plugins {
     id("com.github.spotbugs")
     id("net.ltgt.errorprone")
     id("com.google.osdetector")
+    id("org.gradle.test-retry")
 }
 
 dependencies {
@@ -95,6 +96,12 @@ tasks {
         dependsOn(checkstyleMain, checkstyleTest, pmdMain, pmdTest, spotbugsMain, spotbugsTest)
         finalizedBy(jacocoTestReport, jacocoTestCoverageVerification)
         maxParallelForks = 1
+
+        retry {
+            maxRetries.set(1)
+            maxFailures.set(3)
+            failOnPassedAfterRetry.set(false)
+        }
     }
 
     jacocoTestCoverageVerification {

docker/docker-compose-base.yml

@@ -86,7 +86,7 @@ services:
 
     postgres:
         container_name: postgres
-        image: postgres:17.0
+        image: postgres:17.2
         shm_size: "2gb"
         environment:
             POSTGRES_DB: "otel_demo_db"

spring-boot-2-demo-app/src/main/resources/application.yml

@@ -1,6 +1,7 @@
 app:
     external-base-url: "http://worldtimeapi.org/api/timezone/"
     retries: 3
+    tenant.name: ru-a1-private
 
 server:
     port: 8090

spring-boot-2-demo-app/src/test/java/io/github/mfvanek/spring/boot2/test/IndexesMaintenanceTest.java

@@ -31,7 +31,7 @@ class IndexesMaintenanceTest extends TestBase {
     void checkPostgresVersion() {
         final String pgVersion = jdbcTemplate.queryForObject("select version();", String.class);
         assertThat(pgVersion)
-            .startsWith("PostgreSQL 17.0");
+            .startsWith("PostgreSQL 17.2");
     }
 
     @Test

spring-boot-2-demo-app/src/test/java/io/github/mfvanek/spring/boot2/test/support/PostgresInitializer.java

@@ -17,7 +17,7 @@
 
 public class PostgresInitializer implements ApplicationContextInitializer<ConfigurableApplicationContext> {
 
-    private static final DockerImageName IMAGE = DockerImageName.parse("postgres:17.0");
+    private static final DockerImageName IMAGE = DockerImageName.parse("postgres:17.2");
     private static final Network NETWORK = Network.newNetwork();
     private static final PostgreSQLContainer<?> CONTAINER = new PostgreSQLContainer<>(IMAGE);
 

spring-boot-3-demo-app/src/main/resources/application.yml

@@ -1,6 +1,7 @@
 app:
     external-base-url: "http://worldtimeapi.org/api/timezone/"
     retries: 3
+    tenant.name: ru-a1-private
 
 server:
     port: 8080

spring-boot-3-demo-app/src/test/java/io/github/mfvanek/spring/boot3/test/IndexesMaintenanceTest.java

@@ -31,7 +31,7 @@ class IndexesMaintenanceTest extends TestBase {
     void checkPostgresVersion() {
         final String pgVersion = jdbcTemplate.queryForObject("select version();", String.class);
         assertThat(pgVersion)
-            .startsWith("PostgreSQL 17.0");
+            .startsWith("PostgreSQL 17.2");
     }
 
     @Test

spring-boot-3-demo-app/src/test/java/io/github/mfvanek/spring/boot3/test/support/PostgresInitializer.java

@@ -17,7 +17,7 @@
 
 public class PostgresInitializer implements ApplicationContextInitializer<ConfigurableApplicationContext> {
 
-    private static final DockerImageName IMAGE = DockerImageName.parse("postgres:17.0");
+    private static final DockerImageName IMAGE = DockerImageName.parse("postgres:17.2");
     private static final Network NETWORK = Network.newNetwork();
     private static final PostgreSQLContainer<?> CONTAINER = new PostgreSQLContainer<>(IMAGE);