Adding job scheduler dependency in bwc tests (#1158) (#1160)

* Adding job scheduler dependency in bwc tests Signed-off-by: Varun Jain <varunudr@amazon.com> * Fix naming of job scheduler Signed-off-by: Varun Jain <varunudr@amazon.com> * Corrections in the js path Signed-off-by: Varun Jain <varunudr@amazon.com> * reverting to original change Signed-off-by: Varun Jain <varunudr@amazon.com> --------- Signed-off-by: Varun Jain <varunudr@amazon.com> (cherry picked from commit cb97cab) Co-authored-by: Varun Jain <varunudr@amazon.com>
opensearch-project · Jan 31, 2025 · de15432 · de15432
1 parent 6e7b8ba
commit de15432
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 0 deletions.
diff --git a/qa/build.gradle b/qa/build.gradle
@@ -165,6 +165,17 @@ task pullKnnBwcPlugin {
     }
 }
 
+// Task to pull job scheduler plugin from archive
+task pullJobSchedulerBwcPlugin {
+    dependsOn "pullKnnBwcPlugin"
+    doLast {
+        copy {
+            from(Path.of(tmp_dir.absolutePath, "opensearch-${neural_search_bwc_version_no_qualifier}", "plugins", "opensearch-job-scheduler"))
+            into Path.of(tmp_dir.absolutePath, "opensearch-job-scheduler")
+        }
+    }
+}
+
 // Task to pull neural search plugin from archive
 task pullBwcPlugin {
     doLast {
@@ -176,9 +187,21 @@ task pullBwcPlugin {
     }
 }
 
+// Task to zip opensearch-job-scheduler plugin from archive
+task zipBwcJobSchedulerPlugin(type: Zip) {
+    dependsOn "pullJobSchedulerBwcPlugin"
+    from(Path.of(tmp_dir.absolutePath, "opensearch-job-scheduler"))
+    destinationDirectory = tmp_dir
+    archiveFileName = "opensearch-job-scheduler-${neural_search_bwc_version_no_qualifier}.zip"
+    doLast {
+        delete Path.of(tmp_dir.absolutePath, "opensearch-job-scheduler")
+    }
+}
+
 // Task to zip ml-commons plugin from archive
 task zipBwcMlCommonsPlugin(type: Zip) {
     dependsOn "pullMlCommonsBwcPlugin"
+    dependsOn "zipBwcJobSchedulerPlugin"
     from(Path.of(tmp_dir.absolutePath, "opensearch-ml"))
     destinationDirectory = tmp_dir
     archiveFileName = "opensearch-ml-${neural_search_bwc_version_no_qualifier}.zip"

diff --git a/qa/restart-upgrade/build.gradle b/qa/restart-upgrade/build.gradle
@@ -45,6 +45,7 @@ testClusters {
             }
         }else{
             versions = [ext.neural_search_bwc_version, opensearch_version]
+            plugin(project.tasks.zipBwcJobSchedulerPlugin.archiveFile)
             plugin(project.tasks.zipBwcMlCommonsPlugin.archiveFile)
             plugin(project.tasks.zipBwcKnnPlugin.archiveFile)
             plugin(project.tasks.zipBwcPlugin.archiveFile)

diff --git a/qa/rolling-upgrade/build.gradle b/qa/rolling-upgrade/build.gradle
@@ -45,6 +45,7 @@ testClusters {
             }
         }else{
             versions = [ext.neural_search_bwc_version, opensearch_version]
+            plugin(project.tasks.zipBwcJobSchedulerPlugin.archiveFile)
             plugin(project.tasks.zipBwcMlCommonsPlugin.archiveFile)
             plugin(project.tasks.zipBwcKnnPlugin.archiveFile)
             plugin(project.tasks.zipBwcPlugin.archiveFile)