Only disable test retries on daily builds

Author: trask

.github/workflows/build-common.yml

@@ -9,6 +9,9 @@ on:
       no-build-cache:
         type: boolean
         required: false
+      max-test-retries:
+        type: int
+        required: false
       skip-openj9-tests:
         type: boolean
         required: false
@@ -267,6 +270,7 @@ jobs:
           -Porg.gradle.java.installations.paths=${{ steps.setup-test-java.outputs.path }}
           -Porg.gradle.java.installations.auto-download=false
           ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
+          ${{ inputs.max-test-retries && ' -PmaxTestRetries=' + inputs.max-test-retries || '' }}
 
       - name: Build scan
         if: ${{ !cancelled() && hashFiles('build-scan.txt') != '' }}

.github/workflows/build-daily-no-build-cache.yml

@@ -10,11 +10,19 @@ jobs:
   common:
     uses: ./.github/workflows/build-common.yml
     with:
+      max-test-retries: 0
       no-build-cache: true
 
   test-latest-deps:
     uses: ./.github/workflows/reusable-test-latest-deps.yml
     with:
+      max-test-retries: 0
+      no-build-cache: true
+
+  test-indy:
+    uses: ./.github/workflows/reusable-test-indy.yml
+    with:
+      max-test-retries: 0
       no-build-cache: true
 
   # muzzle is not included here because it doesn't use gradle cache anyway and so is already covered

.github/workflows/build-daily.yml

@@ -9,9 +9,18 @@ on:
 jobs:
   common:
     uses: ./.github/workflows/build-common.yml
+    with:
+      max-test-retries: 0
 
   test-latest-deps:
     uses: ./.github/workflows/reusable-test-latest-deps.yml
+    with:
+      max-test-retries: 0
+
+  test-indy:
+    uses: ./.github/workflows/reusable-test-indy.yml
+    with:
+      max-test-retries: 0
 
   muzzle:
     uses: ./.github/workflows/reusable-muzzle.yml

.github/workflows/reusable-test-indy.yml

@@ -9,6 +9,9 @@ on:
       no-build-cache:
         type: boolean
         required: false
+      max-test-retries:
+        type: int
+        required: false
 
 permissions:
   contents: read
@@ -78,6 +81,7 @@ jobs:
           ${{ env.test-tasks }}
           -PtestIndy=true
           ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
+          ${{ inputs.max-test-retries && ' -PmaxTestRetries=' + inputs.max-test-retries || '' }}
 
       - name: Build scan
         if: ${{ !cancelled() && hashFiles('build-scan.txt') != '' }}

.github/workflows/reusable-test-latest-deps.yml

@@ -9,6 +9,9 @@ on:
       no-build-cache:
         type: boolean
         required: false
+      max-test-retries:
+        type: int
+        required: false
 
 permissions:
   contents: read
@@ -76,6 +79,7 @@ jobs:
           ${{ env.test-tasks }}
           -PtestLatestDeps=true
           ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
+          ${{ inputs.max-test-retries && ' -PmaxTestRetries=' + inputs.max-test-retries || '' }}
 
       - name: Build scan
         if: ${{ !cancelled() && hashFiles('build-scan.txt') != '' }}

conventions/src/main/kotlin/otel.java-conventions.gradle.kts

@@ -366,6 +366,14 @@ tasks.withType<Test>().configureEach {
   // This value is quite big because with lower values (3 mins) we were experiencing large number of false positives
   timeout.set(Duration.ofMinutes(15))
 
+  val defaultMaxRetries = if (System.getenv().containsKey("CI")) 5 else 0
+  val maxTestRetries = gradle.startParameter.projectProperties["maxTestRetries"]?.toInt() ?: defaultMaxRetries
+
+  develocity.testRetry {
+    // You can see tests that were retried by this mechanism in the collected test reports and build scans.
+    maxRetries.set(maxTestRetries);
+  }
+
   reports {
     junitXml.isOutputPerTestCase = true
   }