Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test commit #1148

Closed
wants to merge 13 commits into from
Closed

Test commit #1148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7fffda1
Test commit
vibrantvarun Jan 30, 2025
9efa0b0
commit 2
vibrantvarun Jan 30, 2025
2c12a87
commit 3
vibrantvarun Jan 30, 2025
3418aa7
commit 3
vibrantvarun Jan 30, 2025
92c6979
Commit
vibrantvarun Jan 30, 2025
c6dc785
commit
vibrantvarun Jan 30, 2025
1ae9a5f
commit
vibrantvarun Jan 30, 2025
d931ac3
commit
vibrantvarun Jan 30, 2025
1811292
demo
vibrantvarun Jan 30, 2025
9ec346a
demo
vibrantvarun Jan 30, 2025
713b584
commit
vibrantvarun Jan 30, 2025
2edb0cb
commkit
vibrantvarun Jan 30, 2025
7f20fc5
commit
vibrantvarun Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,7 @@ def knnJarDirectory = "$buildDir/dependencies/opensearch-knn"

dependencies {
api "org.opensearch:opensearch:${opensearch_version}"
zipArchive group: 'org.opensearch.plugin', name:'opensearch-job-scheduler', version: "${opensearch_build}"
zipArchive group: 'org.opensearch.plugin', name:'opensearch-knn', 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}"
Expand All @@ -272,6 +273,12 @@ dependencies {
runtimeOnly("com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}")
testFixturesImplementation "org.opensearch:common-utils:${version}"
testFixturesImplementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.14.0'
// json-path 2.9.0 depends on slf4j 2.0.11, which conflicts with the version used by OpenSearch core.
// Excluding slf4j here since json-path is only used for testing, and logging failures in this context are acceptable.
runtimeOnly('com.jayway.jsonpath:json-path:2.9.0') {
exclude group: 'org.slf4j', module: 'slf4j-api'
}
// OpenSearch core is using slf4j 1.7.36. Therefore, we cannot change the version here.
testFixturesCompileOnly group: 'com.google.guava', name: 'guava', version:'32.1.3-jre'
testFixturesCompileOnly fileTree(dir: knnJarDirectory, include: "opensearch-knn-${opensearch_build}.jar")
}
Expand Down
16 changes: 16 additions & 0 deletions qa/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ def knnJarDirectory = "$rootDir/build/dependencies/opensearch-knn"

dependencies {
api "org.opensearch:opensearch:${opensearch_version}"
zipArchive group: 'org.opensearch.plugin', name:'opensearch-job-scheduler', version: "${opensearch_build}"
zipArchive group: 'org.opensearch.plugin', name:'opensearch-knn', 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")
Expand All @@ -43,6 +44,11 @@ dependencies {
api "org.apache.logging.log4j:log4j-core:${versions.log4j}"
api "junit:junit:${versions.junit}"
testImplementation "org.opensearch.test:framework:${opensearch_version}"
// json-path 2.9.0 depends on slf4j 2.0.11, which conflicts with the version used by OpenSearch core.
// Excluding slf4j here since json-path is only used for testing, and logging failures in this context are acceptable.
testRuntimeOnly('com.jayway.jsonpath:json-path:2.9.0') {
exclude group: 'org.slf4j', module: 'slf4j-api'
}
testImplementation(testFixtures(rootProject))
}

Expand Down Expand Up @@ -70,6 +76,16 @@ if (Os.isFamily(Os.FAMILY_WINDOWS)) {

ext{
plugins = [provider(new Callable<RegularFile>(){
@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<RegularFile>(){
@Override
RegularFile call() throws Exception {
return new RegularFile() {
Expand Down
Loading