Skip to content

Commit b7686fc

Browse files
MINOR: Remove SNAPSHOT Suffixes in Gradle (#35577)
* MINOR: Remove SNAPSHOT Suffixes in Gradle * The snapshot qualifiers here are redundant and 6.5.0 is released anyway
1 parent e4eae46 commit b7686fc

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterConfiguration.groovy

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,11 @@ class ClusterConfiguration {
6969
*/
7070
@Input
7171
Closure<Integer> minimumMasterNodes = {
72-
return getNumNodes() > 1 ? getNumNodes() : -1
72+
if (bwcVersion != null && bwcVersion.before("6.5.0")) {
73+
return numNodes > 1 ? numNodes : -1
74+
} else {
75+
return numNodes > 1 ? numNodes.intdiv(2) + 1 : -1
76+
}
7377
}
7478

7579
@Input

buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ class ClusterFormationTasks {
124124
nodes.add(node)
125125
Closure<Map> writeConfigSetup
126126
Object dependsOn
127-
if (node.nodeVersion.onOrAfter("6.5.0-SNAPSHOT")) {
127+
if (node.nodeVersion.onOrAfter("6.5.0")) {
128128
writeConfigSetup = { Map esConfig ->
129129
// Don't force discovery provider if one is set by the test cluster specs already
130130
if (esConfig.containsKey('discovery.zen.hosts_provider') == false) {

0 commit comments

Comments
 (0)