honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-25 22:36:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14639 from rjernst/fix_plugin_files

Browse Source 
Fix automatic installation of plugin for integ tests
This commit is contained in:
Ryan Ernst 2015-11-09 19:57:32 -08:00
commit 08b6148bb8
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/src/main/groovy/org/elasticsearch/gradle/plugin/PluginBuildPlugin.groovy
View File

@ -49,7 +49,7 @@ class PluginBuildPlugin extends BuildPlugin {
project.integTest.configure { project.integTest.configure {
dependsOn project.bundlePlugin dependsOn project.bundlePlugin
cluster { cluster {
plugin project.name, project.bundlePlugin.outputs.files plugin project.pluginProperties.extension.name, project.bundlePlugin.outputs.files
} }
} }
} }

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

@ -105,7 +105,7 @@ class ClusterFormationTasks {
for (Map.Entry<String, FileCollection> plugin : config.plugins.entrySet()) { for (Map.Entry<String, FileCollection> plugin : config.plugins.entrySet()) {
// replace every dash followed by a character with just the uppercase character // replace every dash followed by a character with just the uppercase character
String camelName = plugin.getKey().replaceAll(/-(\w)/) { _, c -> c.toUpperCase(Locale.ROOT) } String camelName = plugin.getKey().replaceAll(/-(\w)/) { _, c -> c.toUpperCase(Locale.ROOT) }
String taskName = "${task.name}#install${camelName[0].toUpperCase(Locale.ROOT) + camelName.substring(1)}" String taskName = "${task.name}#install${camelName[0].toUpperCase(Locale.ROOT) + camelName.substring(1)}Plugin"
// delay reading the file location until execution time by wrapping in a closure within a GString // delay reading the file location until execution time by wrapping in a closure within a GString
String file = "${ -> new File(pluginsTmpDir, plugin.getValue().singleFile.getName()).toURI().toURL().toString() }" String file = "${ -> new File(pluginsTmpDir, plugin.getValue().singleFile.getName()).toURI().toURL().toString() }"
Object[] args = [new File(home, 'bin/plugin'), 'install', file] Object[] args = [new File(home, 'bin/plugin'), 'install', file]
@ -177,12 +177,10 @@ class ClusterFormationTasks {
if (config.plugins.isEmpty()) { if (config.plugins.isEmpty()) {
return setup return setup
} }
// collect the files for plugins into a list, but wrap each in a closure to delay
// looking for the filename until execution time
List files = config.plugins.values().collect { plugin -> return { plugin.singleFile } }
return project.tasks.create(name: name, type: Copy, dependsOn: setup) { return project.tasks.create(name: name, type: Copy, dependsOn: setup) {
into pluginsTmpDir into pluginsTmpDir
from(*files) // spread the list into varargs from(config.plugins.values())
} }
} }