Only download demo certs when integTest run with -Dsecurity.enabled=t…

…rue (#737) * Only download demo certs when integTest run with -Dsecurity.enabled=true Signed-off-by: Craig Perkins <cwperx@amazon.com> * Make consistent with security.enabled Signed-off-by: Craig Perkins <cwperx@amazon.com> --------- Signed-off-by: Craig Perkins <cwperx@amazon.com>
opensearch-project · Feb 25, 2025 · 740d707 · 740d707
1 parent fa0f422
commit 740d707
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/.github/workflows/test-with-security.yml b/.github/workflows/test-with-security.yml
@@ -29,4 +29,4 @@ jobs:
       - name: Run Job-scheduler Integ Tests with Security
         run: |
           echo "Running integ tests with security..."
-          ./gradlew :integTest --tests "*RestIT" -Dhttps=true -Dsecurity=true  -Dtests.opensearch.secure=true -Dtests.opensearch.username=admin -Dtests.opensearch.password=admin -Duser=admin -Dpassword=admin
+          ./gradlew :integTest --tests "*RestIT" -Dhttps=true -Dsecurity.enabled=true  -Dtests.opensearch.secure=true -Dtests.opensearch.username=admin -Dtests.opensearch.password=admin -Duser=admin -Dpassword=admin
diff --git a/build.gradle b/build.gradle
@@ -54,15 +54,18 @@ ext {
     licenseFile = rootProject.file('LICENSE.txt')
     noticeFile = rootProject.file('NOTICE')
 
-    ['esnode.pem', 'esnode-key.pem', 'kirk.pem', 'kirk-key.pem', 'root-ca.pem', 'sample.pem', 'test-kirk.jks'].forEach { file ->
-        File local = getLayout().getBuildDirectory().file(file).get().getAsFile()
-        download.run {
-            src "https://raw.githubusercontent.com/opensearch-project/security/refs/heads/main/bwc-test/src/test/resources/security/" + file
-            dest local
-            overwrite false
-        }
-        processResources {
-            from(local)
+    runIntegTestWithSecurityPlugin= System.getProperty("security.enabled")
+    if (runIntegTestWithSecurityPlugin == "true"){
+        ['esnode.pem', 'esnode-key.pem', 'kirk.pem', 'kirk-key.pem', 'root-ca.pem', 'sample.pem', 'test-kirk.jks'].forEach { file ->
+            File local = getLayout().getBuildDirectory().file(file).get().getAsFile()
+            download.run {
+                src "https://raw.githubusercontent.com/opensearch-project/security/refs/heads/main/bwc-test/src/test/resources/security/" + file
+                dest local
+                overwrite false
+            }
+            processResources {
+                from(local)
+            }
         }
     }
 }
@@ -281,7 +284,7 @@ def securityPluginFile = resolvePluginFile("opensearch-security")
 
 // === Setup security test ===
 // This flag indicates the existence of security plugin
-def securityEnabled = System.getProperty("security", "false") == "true" || System.getProperty("https", "false") == "true"
+def securityEnabled = System.getProperty("security.enabled", "false") == "true" || System.getProperty("https", "false") == "true"
 afterEvaluate {
     testClusters.integTest.nodes.each { node ->
         def plugins = node.plugins
@@ -360,7 +363,7 @@ task integTestRemote(type: RestIntegTestTask) {
     systemProperty 'java.io.tmpdir', opensearch_tmp_dir.absolutePath
 
     systemProperty "https", System.getProperty("https")
-    systemProperty "security", System.getProperty("security")
+    systemProperty "security.enabled", System.getProperty("security.enabled")
     systemProperty "user", System.getProperty("user")
     systemProperty "password", System.getProperty("password")
     systemProperty 'tests.rest.cluster', 'localhost:9200'