From e8872df1c77c8db9d87f2c462cf67a76bb3d0e45 Mon Sep 17 00:00:00 2001
From: Louis Chu <clingzhi@amazon.com>
Date: Thu, 5 Sep 2024 16:13:35 -0700
Subject: [PATCH] Test fix

Signed-off-by: Louis Chu <clingzhi@amazon.com>
---
 integ-test/build.gradle | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/integ-test/build.gradle b/integ-test/build.gradle
index 1794e736c3..b446b34c79 100644
--- a/integ-test/build.gradle
+++ b/integ-test/build.gradle
@@ -204,6 +204,13 @@ compileTestJava {
     }
 }
 
+testClusters.all {
+    // debug with command, ./gradlew opensearch-sql:run -DdebugJVM. --debug-jvm does not work with keystore.
+    if (System.getProperty("debugJVM") != null) {
+        jvmArgs '-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005'
+    }
+}
+
 def getJobSchedulerPlugin() {
     provider(new Callable<RegularFile>() {
         @Override
@@ -220,13 +227,6 @@ def getJobSchedulerPlugin() {
     })
 }
 
-testClusters.all {
-    // debug with command, ./gradlew opensearch-sql:run -DdebugJVM. --debug-jvm does not work with keystore.
-    if (System.getProperty("debugJVM") != null) {
-        jvmArgs '-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005'
-    }
-}
-
 testClusters {
     integTest {
         testDistribution = 'archive'
@@ -600,13 +600,13 @@ String bwcRemoteFileJSPlugin = bwcRemoteFileRoot + bwcJSPlugin
 }
 
 List<Provider<RegularFile>> plugins = [
-        provider(new Callable<RegularFile>() {
+        provider(new Callable<RegularFile>(){
             @Override
             RegularFile call() throws Exception {
                 return new RegularFile() {
                     @Override
                     File getAsFile() {
-                        return fileTree(bwcJSPluginPath + project.version).getSingleFile()
+                        return configurations.zipArchive.asFileTree.getSingleFile()
                     }
                 }
             }