From 5482a4e227a17fc13123cc46dbbc9e4b96e0fa7c Mon Sep 17 00:00:00 2001 From: Varun Jain Date: Thu, 21 Dec 2023 09:53:51 -0800 Subject: [PATCH] Fixing Flaky tests Signed-off-by: Varun Jain --- qa/restart-upgrade/build.gradle | 16 ---------------- .../bwc/AbstractRollingUpgradeTestCase.java | 2 +- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/qa/restart-upgrade/build.gradle b/qa/restart-upgrade/build.gradle index 6ab0849dd..4f2563aab 100644 --- a/qa/restart-upgrade/build.gradle +++ b/qa/restart-upgrade/build.gradle @@ -37,22 +37,6 @@ List> plugins = [provider(new Callable(){ } }), 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/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/AbstractRollingUpgradeTestCase.java b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/AbstractRollingUpgradeTestCase.java index 089ade9f3..42418f901 100644 --- a/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/AbstractRollingUpgradeTestCase.java +++ b/qa/rolling-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(); }