diff --git a/qa/build.gradle b/qa/build.gradle index 9fe066664..9f487fd9d 100644 --- a/qa/build.gradle +++ b/qa/build.gradle @@ -170,6 +170,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 { @@ -181,9 +192,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 index 053866cf6..8d7c8d8de 100644 --- 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 index 0e7b80db2..530263bb5 100644 --- 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)