From addb1e2cd8a2719d1ae4ee174e3fb55c74372425 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sat, 20 Jan 2024 00:36:36 +0000
Subject: [PATCH] Excluded integTest from build script to handle the security
 plugin dependency (#418)

* Excluded integTest from build script

Signed-off-by: Owais Kazi <owaiskazi19@gmail.com>

* Handled zipArhcive failure for secuirty plugin

Signed-off-by: owaiskazi19 <owaiskazi19@gmail.com>

* Removed security plugin check

Signed-off-by: owaiskazi19 <owaiskazi19@gmail.com>

---------

Signed-off-by: Owais Kazi <owaiskazi19@gmail.com>
Signed-off-by: owaiskazi19 <owaiskazi19@gmail.com>
(cherry picked from commit ab5ac39b45a6f444831c7d8624e5180c97b63388)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 build.gradle | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7dc070fab..b34c47729 100644
--- a/build.gradle
+++ b/build.gradle
@@ -147,6 +147,7 @@ repositories {
 
 configurations {
     zipArchive
+    secureIntegTestPluginArchive
 }
 
 dependencies {
@@ -161,7 +162,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 {
@@ -182,7 +183,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
@@ -346,7 +347,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 {
@@ -359,7 +359,7 @@ testClusters.integTest {
                     }
                 })
             )
-        }
+
     }
 
     // Install Flow Framwork Plugin on integTest cluster nodes