Fix: correct gradle file function name and comment (#795)

* fix gradle file function name and comment Signed-off-by: yuye-aws <[email protected]> * update changelog Signed-off-by: yuye-aws <[email protected]> --------- Signed-off-by: yuye-aws <[email protected]>
opensearch-project · Jul 22, 2024 · d96f7d1 · d96f7d1
1 parent 6811660
commit d96f7d1
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,6 +21,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Adds dynamic knn query parameters efsearch and nprobes [#814](https://github.com/opensearch-project/neural-search/pull/814/)
 - Enable '.' for nested field in text embedding processor ([#811](https://github.com/opensearch-project/neural-search/pull/811))
 ### Bug Fixes
+- Fix function names and comments in the gradle file for BWC tests ([#795](https://github.com/opensearch-project/neural-search/pull/795/files))
 - Fix for missing HybridQuery results when concurrent segment search is enabled ([#800](https://github.com/opensearch-project/neural-search/pull/800))
 ### Infrastructure
 - Add BWC for batch ingestion ([#769](https://github.com/opensearch-project/neural-search/pull/769))

diff --git a/qa/build.gradle b/qa/build.gradle
@@ -164,8 +164,8 @@ task pullBwcPlugin {
     }
 }
 
-// Task to unzip ml-commons plugin from archive
-task unZipBwcMlCommonsPlugin(type: Zip) {
+// Task to zip ml-commons plugin from archive
+task zipBwcMlCommonsPlugin(type: Zip) {
     dependsOn "pullMlCommonsBwcPlugin"
     from(Path.of(tmp_dir.absolutePath, "opensearch-ml"))
     destinationDirectory = tmp_dir
@@ -175,10 +175,10 @@ task unZipBwcMlCommonsPlugin(type: Zip) {
     }
 }
 
-// Task to unzip knn plugin from archive
-task unZipBwcKnnPlugin(type: Zip) {
+// Task to zip knn plugin from archive
+task zipBwcKnnPlugin(type: Zip) {
     dependsOn "pullKnnBwcPlugin"
-    dependsOn "unZipBwcMlCommonsPlugin"
+    dependsOn "zipBwcMlCommonsPlugin"
     from(Path.of(tmp_dir.absolutePath, "opensearch-knn"))
     destinationDirectory = tmp_dir
     archiveFileName = "opensearch-knn-${neural_search_bwc_version_no_qualifier}.zip"
@@ -187,9 +187,9 @@ task unZipBwcKnnPlugin(type: Zip) {
     }
 }
 
-// Task to unzip neural search plugin from archive
-task unZipBwcPlugin(type: Zip) {
-    dependsOn "unZipBwcKnnPlugin"
+// Task to zip neural search plugin from archive
+task zipBwcPlugin(type: Zip) {
+    dependsOn "zipBwcKnnPlugin"
     dependsOn "pullBwcPlugin"
     from(Path.of(tmp_dir.absolutePath, "opensearch-neural-search"))
     destinationDirectory = tmp_dir

diff --git a/qa/restart-upgrade/build.gradle b/qa/restart-upgrade/build.gradle
@@ -45,9 +45,9 @@ testClusters {
             }
         }else{
             versions = [ext.neural_search_bwc_version, opensearch_version]
-            plugin(project.tasks.unZipBwcMlCommonsPlugin.archiveFile)
-            plugin(project.tasks.unZipBwcKnnPlugin.archiveFile)
-            plugin(project.tasks.unZipBwcPlugin.archiveFile)
+            plugin(project.tasks.zipBwcMlCommonsPlugin.archiveFile)
+            plugin(project.tasks.zipBwcKnnPlugin.archiveFile)
+            plugin(project.tasks.zipBwcPlugin.archiveFile)
         }
         setting 'path.repo', "${buildDir}/cluster/shared/repo/${baseName}"
         setting 'http.content_type.required', 'true'
@@ -57,7 +57,7 @@ testClusters {
 // Task to run BWC tests against the old cluster
 task testAgainstOldCluster(type: StandaloneRestIntegTestTask) {
     if(!ext.bwcBundleTest){
-        dependsOn "unZipBwcPlugin"
+        dependsOn "zipBwcPlugin"
     }
     useCluster testClusters."${baseName}"
     systemProperty 'tests.rest.bwcsuite_cluster', 'old_cluster'

diff --git a/qa/rolling-upgrade/build.gradle b/qa/rolling-upgrade/build.gradle
@@ -45,9 +45,9 @@ testClusters {
             }
         }else{
             versions = [ext.neural_search_bwc_version, opensearch_version]
-            plugin(project.tasks.unZipBwcMlCommonsPlugin.archiveFile)
-            plugin(project.tasks.unZipBwcKnnPlugin.archiveFile)
-            plugin(project.tasks.unZipBwcPlugin.archiveFile)
+            plugin(project.tasks.zipBwcMlCommonsPlugin.archiveFile)
+            plugin(project.tasks.zipBwcKnnPlugin.archiveFile)
+            plugin(project.tasks.zipBwcPlugin.archiveFile)
         }
         setting 'path.repo', "${buildDir}/cluster/shared/repo/${baseName}"
         setting 'http.content_type.required', 'true'
@@ -58,7 +58,7 @@ testClusters {
 // Task to run BWC tests against the old cluster
 task testAgainstOldCluster(type: StandaloneRestIntegTestTask) {
     if(!ext.bwcBundleTest){
-        dependsOn "unZipBwcPlugin"
+        dependsOn "zipBwcPlugin"
     }
     useCluster testClusters."${baseName}"
     systemProperty 'tests.rest.bwcsuite_cluster', 'old_cluster'