Skip to content

Commit 50b44eb

Browse files
committed
changing file structure for bwc
Signed-off-by: Amit Galitzky <[email protected]>
1 parent 1f9d215 commit 50b44eb

File tree

2 files changed

+28
-2
lines changed

2 files changed

+28
-2
lines changed

build.gradle

+23-1
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,29 @@ List<Provider<RegularFile>> plugins = [
494494
return new RegularFile() {
495495
@Override
496496
File getAsFile() {
497-
return configurations.zipArchive.asFileTree.getFiles()
497+
return configurations.zipArchive.asFileTree.matching{include "**/opensearch-ml-plugin-${opensearch_build}.zip"}.getSingleFile()
498+
}
499+
}
500+
}
501+
}),
502+
provider(new Callable<RegularFile>(){
503+
@Override
504+
RegularFile call() throws Exception {
505+
return new RegularFile() {
506+
@Override
507+
File getAsFile() {
508+
return configurations.zipArchive.asFileTree.matching{include "**/opensearch-knn-${opensearch_build}.zip"}.getSingleFile()
509+
}
510+
}
511+
}
512+
}),
513+
provider(new Callable<RegularFile>(){
514+
@Override
515+
RegularFile call() throws Exception {
516+
return new RegularFile() {
517+
@Override
518+
File getAsFile() {
519+
return configurations.zipArchive.asFileTree.matching{include "**/neural-search-${opensearch_build}.zip"}.getSingleFile()
498520
}
499521
}
500522
}

src/test/java/org/opensearch/flowframework/rest/FlowFrameworkRestApiIT.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,11 @@ public void testAllDefaultUseCasesCreation() throws Exception {
525525
}
526526

527527
public void testSemanticSearchWithLocalModelEndToEnd() throws Exception {
528-
528+
// Checking if plugins are part of the integration test cluster so we can continue with this test
529+
List<String> plugins = catPlugins();
530+
if (!plugins.contains("opensearch-knn") && plugins.contains("opensearch-neural-search")) {
531+
return;
532+
}
529533
Map<String, Object> defaults = new HashMap<>();
530534
defaults.put("register_local_pretrained_model.name", "huggingface/sentence-transformers/all-MiniLM-L6-v2");
531535
defaults.put("register_local_pretrained_model.version", "1.0.1");

0 commit comments

Comments
 (0)