re attempt

Signed-off-by: Sarthak Aggarwal <sarthagg@amazon.com>
opensearch-project · Jan 25, 2024 · d464da1 · d464da1
1 parent 69d8c10
commit d464da1
Show file tree

Hide file tree

Showing 6 changed files with 342 additions and 362 deletions.
diff --git a/.github/actions/run-bwc-suite/action.yaml b/.github/actions/run-bwc-suite/action.yaml
@@ -43,8 +43,7 @@ runs:
         arguments: |
           -p bwc-test
           bwcTestSuite
-          -Dtests.security.manager=false
-          -Dtests.opensearch.secure=false
+          -Dtests.security.manager=true
           -Dtests.opensearch.username=${{ inputs.username }}
           -Dtests.opensearch.password=${{ inputs.password }}
           -Dbwc.version.previous=${{ steps.build-previous.outputs.built-version }}

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ on:
   pull_request:
 
 env:
-  GRADLE_OPTS: -Dhttp.keepAlive=false
+  GRADLE_OPTS: -Dhttp.keepAlive=true
   CI_ENVIRONMENT: normal
 
 jobs:

diff --git a/bwc-test/build.gradle b/bwc-test/build.gradle
@@ -118,6 +118,11 @@ def String extractVersion(versionStr) {
                 }
             }))
             nodes.each { node ->
+                def plugins = node.plugins
+                def firstPlugin = plugins.get(0)
+                plugins.remove(0)
+                plugins.add(firstPlugin)
+
                 node.setting("network.bind_host", "0.0.0.0")
                 node.setting("network.publish_host", "0.0.0.0")
             }
@@ -149,6 +154,12 @@ List<Provider<RegularFile>> plugins = [
         systemProperty 'tests.rest.bwcsuite', 'old_cluster'
         systemProperty 'tests.rest.bwcsuite_round', 'old'
         systemProperty 'tests.plugin_bwc_version', bwcVersion
+
+        systemProperty 'tests.security.manager', 'true'
+        systemProperty "https", System.getProperty("https")
+        systemProperty "user", System.getProperty("user")
+        systemProperty "password", System.getProperty("password")
+
         nonInputProperties.systemProperty('tests.rest.cluster', "${-> testClusters."${baseName}$i".allHttpSocketURI.join(",")}")
         nonInputProperties.systemProperty('tests.clustername', "${-> testClusters."${baseName}$i".getName()}")
     }
@@ -166,6 +177,13 @@ task "${baseName}#mixedClusterTask"(type: StandaloneRestIntegTestTask) {
     systemProperty 'tests.rest.bwcsuite', 'mixed_cluster'
     systemProperty 'tests.rest.bwcsuite_round', 'first'
     systemProperty 'tests.plugin_bwc_version', bwcVersion
+
+    systemProperty 'tests.security.manager', 'true'
+    systemProperty "https", System.getProperty("https")
+    systemProperty "user", System.getProperty("user")
+    systemProperty "password", System.getProperty("password")
+
+
     nonInputProperties.systemProperty('tests.rest.cluster', "${-> testClusters."${baseName}0".allHttpSocketURI.join(",")}")
     nonInputProperties.systemProperty('tests.clustername', "${-> testClusters."${baseName}0".getName()}")
 }
@@ -182,6 +200,12 @@ task "${baseName}#twoThirdsUpgradedClusterTask"(type: StandaloneRestIntegTestTas
     systemProperty 'tests.rest.bwcsuite', 'mixed_cluster'
     systemProperty 'tests.rest.bwcsuite_round', 'second'
     systemProperty 'tests.plugin_bwc_version', bwcVersion
+
+    systemProperty 'tests.security.manager', 'true'
+    systemProperty "https", System.getProperty("https")
+    systemProperty "user", System.getProperty("user")
+    systemProperty "password", System.getProperty("password")
+
     nonInputProperties.systemProperty('tests.rest.cluster', "${-> testClusters."${baseName}0".allHttpSocketURI.join(",")}")
     nonInputProperties.systemProperty('tests.clustername', "${-> testClusters."${baseName}0".getName()}")
 }
@@ -198,6 +222,12 @@ task "${baseName}#rollingUpgradeClusterTask"(type: StandaloneRestIntegTestTask)
     systemProperty 'tests.rest.bwcsuite', 'mixed_cluster'
     systemProperty 'tests.rest.bwcsuite_round', 'third'
     systemProperty 'tests.plugin_bwc_version', bwcVersion
+
+    systemProperty 'tests.security.manager', 'true'
+    systemProperty "https", System.getProperty("https")
+    systemProperty "user", System.getProperty("user")
+    systemProperty "password", System.getProperty("password")
+
     nonInputProperties.systemProperty('tests.rest.cluster', "${-> testClusters."${baseName}0".allHttpSocketURI.join(",")}")
     nonInputProperties.systemProperty('tests.clustername', "${-> testClusters."${baseName}0".getName()}")
 }
@@ -213,6 +243,12 @@ tasks.register("${baseName}#fullRestartClusterTask", StandaloneRestIntegTestTask
     systemProperty 'tests.rest.bwcsuite', 'upgraded_cluster'
     systemProperty 'tests.plugin_bwc_version', bwcVersion
     systemProperty 'tests.rest.bwcsuite_round', 'first'
+
+    systemProperty 'tests.security.manager', 'true'
+    systemProperty "https", System.getProperty("https")
+    systemProperty "user", System.getProperty("user")
+    systemProperty "password", System.getProperty("password")
+
     nonInputProperties.systemProperty('tests.rest.cluster', "${-> testClusters."${baseName}1".allHttpSocketURI.join(",")}")
     nonInputProperties.systemProperty('tests.clustername', "${-> testClusters."${baseName}1".getName()}")
 }