Only conditionally apply retries no integrationTests

Signed-off-by: Peter Nied <[email protected]>
cwperks · Oct 6, 2023 · 6b4b5c4 · 6b4b5c4
1 parent 033d59f
commit 6b4b5c4
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/build.gradle b/build.gradle
@@ -190,16 +190,6 @@ task listTasksAsJSON {
 
 test {
     include '**/*.class'
-    doFirst {
-        // Only run with retries while in CI systems
-        if (System.getenv('CI_ENVIRONMENT') == 'normal') {
-            retry {
-                failOnPassedAfterRetry = false
-                maxRetries = 5
-            }
-        }
-    }
-
     filter {
         excludeTestsMatching "org.opensearch.security.sanity.tests.*"
     }
@@ -208,6 +198,10 @@ test {
     if (JavaVersion.current() > JavaVersion.VERSION_1_8) {
         jvmArgs += "--add-opens=java.base/java.io=ALL-UNNAMED"
     }
+    retry {
+        failOnPassedAfterRetry = false
+        maxRetries = 5
+    }
     jacoco {
         excludes = [
                 "com.sun.jndi.dns.*",
@@ -251,6 +245,10 @@ def setCommonTestConfig(Test task) {
     if (JavaVersion.current() > JavaVersion.VERSION_1_8) {
         task.jvmArgs += "--add-opens=java.base/java.io=ALL-UNNAMED"
     }
+    task.retry {
+        failOnPassedAfterRetry = false
+        maxRetries = 5
+    }
     task.jacoco {
         excludes = [
                 "com.sun.jndi.dns.*",