From 1b485f778f3773f2fb007801a716c3ee481aa8b5 Mon Sep 17 00:00:00 2001 From: Yizhe Liu Date: Wed, 29 Jan 2025 12:34:25 -0800 Subject: [PATCH] Fixing integ tests due to missing opensearch-job-scheduler plugin Signed-off-by: Yizhe Liu --- build.gradle | 1 + qa/build.gradle | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/build.gradle b/build.gradle index 90b1ca1f1..cfade0c62 100644 --- a/build.gradle +++ b/build.gradle @@ -251,6 +251,7 @@ def knnJarDirectory = "$buildDir/dependencies/opensearch-knn" dependencies { api "org.opensearch:opensearch:${opensearch_version}" zipArchive group: 'org.opensearch.plugin', name:'opensearch-knn', version: "${opensearch_build}" + zipArchive group: 'org.opensearch.plugin', name:'opensearch-job-scheduler', version: "${opensearch_build}" zipArchive group: 'org.opensearch.plugin', name:'opensearch-ml-plugin', version: "${opensearch_build}" secureIntegTestPluginArchive group: 'org.opensearch.plugin', name:'opensearch-security', version: "${opensearch_build}" compileOnly fileTree(dir: knnJarDirectory, include: "opensearch-knn-${opensearch_build}.jar") diff --git a/qa/build.gradle b/qa/build.gradle index 62d95ea49..373e21c7d 100644 --- a/qa/build.gradle +++ b/qa/build.gradle @@ -35,6 +35,7 @@ def knnJarDirectory = "$rootDir/build/dependencies/opensearch-knn" dependencies { api "org.opensearch:opensearch:${opensearch_version}" zipArchive group: 'org.opensearch.plugin', name:'opensearch-knn', version: "${opensearch_build}" + zipArchive group: 'org.opensearch.plugin', name:'opensearch-job-scheduler', version: "${opensearch_build}" zipArchive group: 'org.opensearch.plugin', name:'opensearch-ml-plugin', version: "${opensearch_build}" compileOnly fileTree(dir: knnJarDirectory, include: "opensearch-knn-${opensearch_build}.jar") compileOnly group: 'com.google.guava', name: 'guava', version:'32.1.3-jre' @@ -70,6 +71,16 @@ if (Os.isFamily(Os.FAMILY_WINDOWS)) { ext{ plugins = [provider(new Callable(){ + @Override + RegularFile call() throws Exception { + return new RegularFile() { + @Override + File getAsFile() { + return configurations.zipArchive.asFileTree.matching{include "**/opensearch-job-scheduler-${opensearch_build}.zip"}.getSingleFile() + } + } + } + }), provider(new Callable(){ @Override RegularFile call() throws Exception { return new RegularFile() {