Fixing Flaky tests

Signed-off-by: Varun Jain <[email protected]>
opensearch-project · Dec 21, 2023 · 5482a4e · 5482a4e
1 parent 975eaea
commit 5482a4e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 17 deletions.
diff --git a/qa/restart-upgrade/build.gradle b/qa/restart-upgrade/build.gradle
@@ -37,22 +37,6 @@ List<Provider<RegularFile>> plugins = [provider(new Callable<RegularFile>(){
     }
 }), rootProject.tasks.bundlePlugin.archiveFile]
 
-// task unzip {
-//     configurations.zipArchive.asFileTree.each {
-//         println(it.toPath())
-//     }
-// }
-
-// def tmp_dir = project.file('build/private/artifact_tmp').absoluteFile
-
-
-// task unzip(type: Copy) {
-//     configurations.zipArchive.asFileTree.each {
-//         from(zipTree(it))
-//     }
-//     into tmp_dir
-// }
-
 // Creates a test cluster of previous version and loads k-NN plugin of bwcVersion
 testClusters {
     "${baseName}" {

diff --git a/...upgrade/src/test/java/org/opensearch/neuralsearch/bwc/AbstractRollingUpgradeTestCase.java b/...upgrade/src/test/java/org/opensearch/neuralsearch/bwc/AbstractRollingUpgradeTestCase.java
@@ -52,7 +52,7 @@ protected final Settings restClientSettings() {
                 // increase the timeout here to 90 seconds to handle long waits for a green
                 // cluster health. the waits for green need to be longer than a minute to
                 // account for delayed shards
-                .put(OpenSearchRestTestCase.CLIENT_SOCKET_TIMEOUT, CLIENT_TIMEOUT_VALUE)
+                .put(OpenSearchRestTestCase.CLIENT_SOCKET_TIMEOUT, "120s")
                 .build();
     }