honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18865 from rjernst/fix_extra_config_file 

Test: Fix integ test extra config files to work with more than one
This commit is contained in:
Ryan Ernst 2016-06-14 10:59:26 -07:00 committed by GitHub
parent 3032a7c653 0508fc3bf1
commit 399d023715
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy
View File

@ -291,9 +291,10 @@ class ClusterFormationTasks {
File configDir = new File(node.homeDir, 'config') File configDir = new File(node.homeDir, 'config')
copyConfig.into(configDir) // copy must always have a general dest dir, even though we don't use it copyConfig.into(configDir) // copy must always have a general dest dir, even though we don't use it
for (Map.Entry<String,Object> extraConfigFile : node.config.extraConfigFiles.entrySet()) { for (Map.Entry<String,Object> extraConfigFile : node.config.extraConfigFiles.entrySet()) {
Object extraConfigFileValue = extraConfigFile.getValue()
copyConfig.doFirst { copyConfig.doFirst {
// make sure the copy won't be a no-op or act on a directory // make sure the copy won't be a no-op or act on a directory
File srcConfigFile = project.file(extraConfigFile.getValue()) File srcConfigFile = project.file(extraConfigFileValue)
if (srcConfigFile.isDirectory()) { if (srcConfigFile.isDirectory()) {
throw new GradleException("Source for extraConfigFile must be a file: ${srcConfigFile}") throw new GradleException("Source for extraConfigFile must be a file: ${srcConfigFile}")
} }
@ -303,7 +304,7 @@ class ClusterFormationTasks {
} }
File destConfigFile = new File(node.homeDir, 'config/' + extraConfigFile.getKey()) File destConfigFile = new File(node.homeDir, 'config/' + extraConfigFile.getKey())
// wrap source file in closure to delay resolution to execution time // wrap source file in closure to delay resolution to execution time
copyConfig.from({ extraConfigFile.getValue() }) { copyConfig.from({ extraConfigFileValue }) {
// this must be in a closure so it is only applied to the single file specified in from above // this must be in a closure so it is only applied to the single file specified in from above
into(configDir.toPath().relativize(destConfigFile.canonicalFile.parentFile.toPath()).toFile()) into(configDir.toPath().relativize(destConfigFile.canonicalFile.parentFile.toPath()).toFile())
rename { destConfigFile.name } rename { destConfigFile.name }