Skip to content

Replace all instances of ARCHIVE with INTEG_TEST #1611

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

Open
cwperks wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Replace all instances of ARCHIVE with INTEG_TEST #1611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
61755a1
Replace all instances of ARCHIVE with INTEG_TEST
cwperks Dec 15, 2025
5510d8d
Remove java.security.policy
cwperks Dec 15, 2025
e280fb9
Remove plugin-security.policy in test resources
cwperks Dec 15, 2025
7f0316e
Merge branch 'main' into use-integ-test
cwperks Dec 15, 2025
4dd6f01
Try setting network.host
cwperks Dec 16, 2025
5eef71a
Merge branch 'use-integ-test' of github.com:cwperks/cross-cluster-rep…
cwperks Dec 16, 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
14 changes: 3 additions & 11 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,6 @@ testClusters {
testDistribution = "INTEG_TEST"
if(knnEnabled) {
plugin(provider(knnPluginFile))
testDistribution = "ARCHIVE"
systemProperty "java.library.path", "${buildDir}/testclusters/leaderCluster-0/distro/${opensearch_version_no_qualifier}-ARCHIVE/plugins/opensearch-knn/lib"
environment "LD_LIBRARY_PATH", "${buildDir}/testclusters/leaderCluster-0/distro/${opensearch_version_no_qualifier}-ARCHIVE/plugins/opensearch-knn/lib"
}
Expand All @@ -396,6 +395,7 @@ testClusters {
if (_numNodes > 1) numberOfNodes = _numNodes
//numberOfNodes = 3
setting 'path.repo', repo.absolutePath
setting "network.host", "127.0.0.1"
if(_numNodes == 1) jvmArgs "${-> getDebugJvmArgs(debugPort++)}"
}
followCluster {
Expand All @@ -406,14 +406,14 @@ testClusters {
}
if(knnEnabled) {
plugin(provider(knnPluginFile))
testDistribution = "ARCHIVE"
systemProperty "java.library.path", "${buildDir}/testclusters/followCluster-0/distro/${opensearch_version_no_qualifier}-ARCHIVE/plugins/opensearch-knn/lib"
environment "LD_LIBRARY_PATH", "${buildDir}/testclusters/followCluster-0/distro/${opensearch_version_no_qualifier}-ARCHIVE/plugins/opensearch-knn/lib"
}
int debugPort = 5010
if (_numNodes > 1) numberOfNodes = _numNodes
//numberOfNodes = 3
setting 'path.repo', repo.absolutePath
setting "network.host", "127.0.0.1"
if(_numNodes == 1) jvmArgs "${-> getDebugJvmArgs(debugPort++)}"
}
}
Expand Down Expand Up @@ -542,7 +542,6 @@ integTest {
}

systemProperty "build.dir", "${buildDir}"
systemProperty "java.security.policy", "file://${projectDir}/src/test/resources/plugin-security.policy"
finalizedBy jacocoTestReport
}

Expand Down Expand Up @@ -698,13 +697,7 @@ clusters.each { name ->
plugin(provider(securityPluginOld))
cliSetup("opensearch-security/install_demo_configuration.sh", "-y")
}
// Currently fetching the ARCHIVE distribution fails on mac as it tries to fetch the Mac specific "DARWIN" distribution
// for Opensearch which is not publish yet. Changing this to INTEG_TEST to make it work on mac.
if (System.getProperty("os.name").startsWith("Mac")) {
testDistribution = "INTEG_TEST"
} else {
testDistribution = "ARCHIVE"
}
testDistribution = "INTEG_TEST"

if (_numNodes != 3) numberOfNodes = 3
setting 'path.repo', repo.absolutePath
Expand Down Expand Up @@ -750,7 +743,6 @@ List<Provider<RegularFile>> replPluginProvider = [
}
}
systemProperty "build.dir", "${buildDir}"
systemProperty "java.security.policy", "file://${projectDir}/src/test/resources/plugin-security.policy"
nonInputProperties.systemProperty('tests.cluster_suffix', i)
nonInputProperties.systemProperty('tests.bwcTask', "oldVersionClusterTask")
filter {
Expand Down
3 changes: 0 additions & 3 deletions src/test/resources/plugin-security.policy
View file
Open in desktop

This file was deleted.

Loading