resolve conflicts and address review feedback

Signed-off-by: rs-eliatra <[email protected]>
opensearch-project · Feb 11, 2022 · 7314442 · 7314442
1 parent e66d040
commit 7314442
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ on:
       - opendistro-*
 
 env:
-  GRADLE_OPTS: -Dhttp.keepAlive=false -DCI=true
+  GRADLE_OPTS: -Dhttp.keepAlive=false
 
 jobs:
   build:

diff --git a/build.gradle b/build.gradle
@@ -114,7 +114,9 @@ dependencies {
     testImplementation 'javax.servlet:servlet-api:2.5'
     testImplementation 'com.unboundid:unboundid-ldapsdk:4.0.9'
     testImplementation 'com.github.stephenc.jcip:jcip-annotations:1.0-1'
-    testImplementation 'org.apache.kafka:kafka-clients:2.0.1:test'
+    testImplementation 'org.apache.kafka:kafka_2.13:2.8.1'
+    testImplementation 'org.apache.kafka:kafka_2.13:2.8.1:test'
+    testImplementation 'org.apache.kafka:kafka-clients:2.8.1:test'
     compileOnly "io.netty:netty-tcnative:2.0.25.Final:${osdetector.classifier}"
     testImplementation "io.netty:netty-tcnative:2.0.25.Final:${osdetector.classifier}"
     compileOnly "org.opensearch:opensearch:${opensearch_version}"
@@ -212,17 +214,14 @@ testsJar {
     libsDirName = '.'
 }
 
-boolean isCI = System.getenv().containsKey("CI")
 
 test {
     maxParallelForks = 3
     jvmArgs "-Xmx3072m"
     retry {
-        if (isCI) {
-            failOnPassedAfterRetry = false
-            maxFailures = 30
-            maxRetries = 3
-        }
+        failOnPassedAfterRetry = false
+        maxFailures = 30
+        maxRetries = 5
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,7 @@ on: @@
           - opendistro-*
     env:
-      GRADLE_OPTS: -Dhttp.keepAlive=false -DCI=true
+      GRADLE_OPTS: -Dhttp.keepAlive=false
     jobs:
       build:
@@ Expand Down @@