浏览代码

Fix cluster formation BWC versions

We support JDK 10 through the 6.3 and 6.4 series. This commit adjusts
the BWC logic when starting nodes during tests to account for this.
Jason Tedor 7 年之前
父节点
当前提交
19cc4439d7
共有 1 个文件被更改,包括 1 次插入5 次删除
  1. 1 5
      buildSrc/src/main/groovy/org/elasticsearch/gradle/test/NodeInfo.groovy

+ 1 - 5
buildSrc/src/main/groovy/org/elasticsearch/gradle/test/NodeInfo.groovy

@@ -177,11 +177,7 @@ class NodeInfo {
             javaVersion = 8
         } else if (nodeVersion.onOrAfter("6.2.0") && nodeVersion.before("6.3.0")) {
             javaVersion = 9
-        } else if (project.inFipsJvm && nodeVersion.onOrAfter("6.3.0") && nodeVersion.before("6.4.0")) {
-            /*
-             * Elasticsearch versions before 6.4.0 cannot be run in a FIPS-140 JVM. If we're running
-             * bwc tests in a FIPS-140 JVM, ensure that the pre v6.4.0 nodes use a Java 10 JVM instead.
-             */
+        } else if (nodeVersion.onOrAfter("6.3.0") && nodeVersion.before("6.5.0")) {
             javaVersion = 10
         }