Skip to content

Commit

Permalink
Excluded integTest from build script to handle the security plugin de…
Browse files Browse the repository at this point in the history
…pendency (#418)

* Excluded integTest from build script

Signed-off-by: Owais Kazi <[email protected]>

* Handled zipArhcive failure for secuirty plugin

Signed-off-by: owaiskazi19 <[email protected]>

* Removed security plugin check

Signed-off-by: owaiskazi19 <[email protected]>

---------

Signed-off-by: Owais Kazi <[email protected]>
Signed-off-by: owaiskazi19 <[email protected]>
  • Loading branch information
owaiskazi19 committed Jan 20, 2024
1 parent 789fc4d commit ab5ac39
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ repositories {

configurations {
zipArchive
secureIntegTestPluginArchive
}

dependencies {
Expand All @@ -162,7 +163,7 @@ dependencies {

// ZipArchive dependencies used for integration tests
zipArchive group: 'org.opensearch.plugin', name:'opensearch-ml-plugin', version: "${opensearch_build}"
zipArchive group: 'org.opensearch.plugin', name:'opensearch-security', version: "${opensearch_build}"
secureIntegTestPluginArchive group: 'org.opensearch.plugin', name:'opensearch-security', version: "${opensearch_build}"

configurations.all {
resolutionStrategy {
Expand All @@ -183,7 +184,7 @@ ext{
configureSecurityPlugin = { OpenSearchCluster cluster ->

// Retrieve Security Plugin Zip from zipArchive
configurations.zipArchive.asFileTree.each {
configurations.secureIntegTestPluginArchive.asFileTree.each {
if(it.name.contains("opensearch-security")) {
cluster.plugin(provider(new Callable<RegularFile>(){
@Override
Expand Down Expand Up @@ -347,7 +348,6 @@ testClusters.integTest {

// Installs all registered zipArchive dependencies on integTest cluster nodes except security
configurations.zipArchive.asFileTree.each {
if(!it.name.contains("opensearch-security")) {
plugin(provider(new Callable<RegularFile>(){
@Override
RegularFile call() throws Exception {
Expand All @@ -360,7 +360,7 @@ testClusters.integTest {
}
})
)
}

}

// Install Flow Framwork Plugin on integTest cluster nodes
Expand Down

0 comments on commit ab5ac39

Please sign in to comment.