From b9fd0e4b409a95746b8dfb522d3300ca22aec191 Mon Sep 17 00:00:00 2001
From: Finn Carroll <carrofin@amazon.com>
Date: Fri, 13 Sep 2024 17:25:04 +0000
Subject: [PATCH] Fix restart bwc

Signed-off-by: Finn Carroll <carrofin@amazon.com>
---
 build.gradle | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index f00dfaf..96d75a6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -426,11 +426,7 @@ task "${baseName}#fullRestartClusterTask"(type: StandaloneRestIntegTestTask) {
     dependsOn "${baseName}#oldVersionClusterTask1"
     useCluster testClusters."${baseName}1"
     doFirst {
-        if (bwcBundleTest){
-            testClusters."${baseName}1".nextNodeToNextVersion()
-        } else {
-            testClusters."${baseName}1".upgradeNodeAndPluginToNextVersion(plugins)
-        }
+        testClusters."${baseName}1".upgradeAllNodesAndPluginsToNextVersion(plugins)
     }
     filter {
         includeTestsMatching "org.opensearch.search.asynchronous.bwc.*IT"