Update list of plugins in gradle projects

elastic · Apr 27, 2018 · 7eeb112 · 7eeb112
1 parent c645ba5
commit 7eeb112
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 15 deletions.
diff --git a/qa/smoke-test-plugins/build.gradle b/qa/smoke-test-plugins/build.gradle
@@ -23,9 +23,9 @@ apply plugin: 'elasticsearch.standalone-rest-test'
 apply plugin: 'elasticsearch.rest-test'
 
 ext.pluginsCount = 0
-project.rootProject.subprojects.findAll { it.parent.path == ':plugins' }.each { subproj ->
+project(':plugins').getChildProjects().each { pluginName, pluginProject ->
   integTestCluster {
-    plugin subproj.path
+    plugin pluginProject.path
   }
   pluginsCount += 1
 }

diff --git a/qa/vagrant/build.gradle b/qa/vagrant/build.gradle
@@ -22,7 +22,7 @@ apply plugin: 'elasticsearch.vagrant'
 
 List<String> plugins = []
 for (Project subproj : project.rootProject.subprojects) {
-  if (subproj.path.startsWith(':plugins:') || subproj.path.equals(':example-plugins:custom-settings')) {
+  if (subproj.parent.path == ':plugins' || subproj.path.equals(':example-plugins:custom-settings')) {
     // add plugin as a dep
     dependencies {
       packaging project(path: "${subproj.path}", configuration: 'zip')

diff --git a/x-pack/qa/smoke-test-plugins-ssl/build.gradle b/x-pack/qa/smoke-test-plugins-ssl/build.gradle
@@ -162,12 +162,10 @@ integTestCluster.dependsOn(importClientCertificateInNodeKeyStore, importNodeCert
 
 
 ext.pluginsCount = 0
-project.rootProject.subprojects.findAll { it.path.startsWith(':plugins:') }.each { subproj ->
-  if (subproj.plugins.hasPlugin(PluginBuildPlugin) || subproj.plugins.hasPlugin(MetaPluginBuildPlugin)) {
-    // need to get a non-decorated project object, so must re-lookup the project by path
-    integTestCluster.plugin(subproj.path)
-    pluginsCount += 1
-  }
+project(':plugins').getChildProjects().each { pluginName, pluginProject ->
+  // need to get a non-decorated project object, so must re-lookup the project by path
+  integTestCluster.plugin(pluginProject.path)
+  pluginsCount += 1
 }
 
 integTestCluster {

diff --git a/x-pack/qa/smoke-test-plugins/build.gradle b/x-pack/qa/smoke-test-plugins/build.gradle
@@ -10,12 +10,10 @@ dependencies {
 }
 
 ext.pluginsCount = 0
-project.rootProject.subprojects.findAll { it.path.startsWith(':plugins:') }.each { subproj ->
-  if (subproj.plugins.hasPlugin(PluginBuildPlugin) || subproj.plugins.hasPlugin(MetaPluginBuildPlugin)) {
-    // need to get a non-decorated project object, so must re-lookup the project by path
-    integTestCluster.plugin(subproj.path)
-    pluginsCount += 1
-  }
+project(':plugins').getChildProjects().each { pluginName, pluginProject ->
+  // need to get a non-decorated project object, so must re-lookup the project by path
+  integTestCluster.plugin(pluginProject.path)
+  pluginsCount += 1
 }
 
 integTestCluster {