Apply feedback

Author: tlrx

plugins/repository-s3/build.gradle

@@ -64,6 +64,11 @@ test {
   exclude '**/*CredentialsTests.class'
 }
 
+check {
+  // also execute the QA tests when testing the plugin
+  dependsOn 'qa:amazon-s3:check'
+}
+
 integTestCluster {
   keystoreSetting 's3.client.integration_test.access_key', "s3_integration_test_access_key"
   keystoreSetting 's3.client.integration_test.secret_key', "s3_integration_test_secret_key"

qa/third-party/amazon-s3/build.gradle renamed to plugins/repository-s3/qa/amazon-s3/build.gradle

@@ -77,5 +77,7 @@ integTestCluster {
         dependsOn s3Fixture
         /* Use a closure on the string to delay evaluation until tests are executed */
         setting 's3.client.integration_test.endpoint', "http://${-> s3Fixture.addressAndPort}"
+    } else {
+        println "Using an external service to test the repository-s3 plugin"
     }
 }

qa/third-party/amazon-s3/src/test/java/org/elasticsearch/repositories/s3/AmazonS3Fixture.java renamed to plugins/repository-s3/qa/amazon-s3/src/test/java/org/elasticsearch/repositories/s3/AmazonS3Fixture.java

@@ -1,5 +1,7 @@
 import org.elasticsearch.gradle.LoggedExec
 import org.elasticsearch.gradle.MavenFilteringHack
+import org.elasticsearch.gradle.plugin.MetaPluginBuildPlugin
+import org.elasticsearch.gradle.plugin.PluginBuildPlugin
 import org.elasticsearch.gradle.test.NodeInfo
 
 import javax.net.ssl.HttpsURLConnection
@@ -161,9 +163,11 @@ integTestCluster.dependsOn(importClientCertificateInNodeKeyStore, importNodeCert
 
 ext.pluginsCount = 0
 project.rootProject.subprojects.findAll { it.path.startsWith(':plugins:') }.each { subproj ->
-  // need to get a non-decorated project object, so must re-lookup the project by path
-  integTestCluster.plugin(subproj.path)
-  pluginsCount += 1
+  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
+  }
 }
 
 integTestCluster {

qa/third-party/amazon-s3/src/test/java/org/elasticsearch/repositories/s3/AmazonS3RepositoryClientYamlTestSuiteIT.java renamed to plugins/repository-s3/qa/amazon-s3/src/test/java/org/elasticsearch/repositories/s3/AmazonS3RepositoryClientYamlTestSuiteIT.java

@@ -1,4 +1,6 @@
 import org.elasticsearch.gradle.MavenFilteringHack
+import org.elasticsearch.gradle.plugin.MetaPluginBuildPlugin
+import org.elasticsearch.gradle.plugin.PluginBuildPlugin
 
 apply plugin: 'elasticsearch.standalone-rest-test'
 apply plugin: 'elasticsearch.rest-test'
@@ -9,9 +11,11 @@ dependencies {
 
 ext.pluginsCount = 0
 project.rootProject.subprojects.findAll { it.path.startsWith(':plugins:') }.each { subproj ->
-  // need to get a non-decorated project object, so must re-lookup the project by path
-  integTestCluster.plugin(subproj.path)
-  pluginsCount += 1
+  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
+  }
 }
 
 integTestCluster {