Ensure test cluster classpath inputs have predictable ordering (#43938)

elastic · Jul 3, 2019 · baabb75 · baabb75
1 parent c0d5bec
commit baabb75
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java b/buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java
@@ -57,6 +57,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
@@ -880,6 +881,7 @@ private List<File> getInstalledFileSet(Action<? super PatternFilterable> filter)
  // https://docs.gradle.org/nightly/release-notes.html#improved-handling-of-zip-archives-on-classpaths
  .map(zipFile -> project.zipTree(zipFile).matching(filter))
  .flatMap(tree -> tree.getFiles().stream())
+ .sorted(Comparator.comparing(File::getName))
  .collect(Collectors.toList());
  }
 
@@ -901,8 +903,13 @@ private List<File> getInstalledFiles() {
  }
 
  @Classpath
- private Set<File> getDistributionClasspath() {
- return project.fileTree(getExtractedDistributionDir()).matching(filter -> filter.include("**/*.jar")).getFiles();
+ private List<File> getDistributionClasspath() {
+ ArrayList<File> files = new ArrayList<>(project.fileTree(getExtractedDistributionDir())
+ .matching(filter -> filter.include("**/*.jar"))
+ .getFiles());
+ files.sort(Comparator.comparing(File::getName));
+
+ return files;
  }
 
  @InputFiles