From 01dfb7481ede9d2a1fbf0ad06ccb9f1f74a48c22 Mon Sep 17 00:00:00 2001
From: Ryan Ernst <ryan@iernst.net>
Date: Fri, 15 Jul 2016 14:36:13 -0700
Subject: [PATCH] Build: Switch to new plugin configuration for integ tests

This is the xplugins side of elastic/elasticsearchelastic/elasticsearch#19461

Original commit: elastic/x-pack-elasticsearch@bb29f9e948c6756e100ef9403e02df0a8ab41132
---
 elasticsearch/qa/audit-tests/build.gradle                     | 2 +-
 elasticsearch/qa/core-rest-tests-with-security/build.gradle   | 2 +-
 elasticsearch/qa/reindex-tests-with-security/build.gradle     | 2 +-
 elasticsearch/qa/security-client-tests/build.gradle           | 2 +-
 elasticsearch/qa/security-example-realm/build.gradle          | 2 +-
 elasticsearch/qa/security-migrate-tests/build.gradle          | 2 +-
 elasticsearch/qa/smoke-test-graph-with-security/build.gradle  | 2 +-
 .../qa/smoke-test-monitoring-with-security/build.gradle       | 2 +-
 elasticsearch/qa/smoke-test-plugins-ssl/build.gradle          | 4 ++--
 elasticsearch/qa/smoke-test-plugins/build.gradle              | 4 ++--
 elasticsearch/qa/smoke-test-watcher-with-groovy/build.gradle  | 2 +-
 .../qa/smoke-test-watcher-with-mustache/build.gradle          | 2 +-
 .../qa/smoke-test-watcher-with-painless/build.gradle          | 2 +-
 .../qa/smoke-test-watcher-with-security/build.gradle          | 2 +-
 elasticsearch/qa/smoke-test-watcher/build.gradle              | 2 +-
 15 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/elasticsearch/qa/audit-tests/build.gradle b/elasticsearch/qa/audit-tests/build.gradle
index 319824d30bb..ac432795388 100644
--- a/elasticsearch/qa/audit-tests/build.gradle
+++ b/elasticsearch/qa/audit-tests/build.gradle
@@ -14,7 +14,7 @@ project.sourceSets.test.output.dir(outputDir, builtBy: copyXPackPluginProps)
 
 integTest {
   cluster {
-    plugin 'x-pack', project(':x-plugins:elasticsearch:x-pack')
+    plugin ':x-plugins:elasticsearch:x-pack'
     setting 'xpack.security.audit.enabled', 'true'
     setting 'xpack.security.audit.outputs', 'index'
     setting 'logger.level', 'DEBUG'
diff --git a/elasticsearch/qa/core-rest-tests-with-security/build.gradle b/elasticsearch/qa/core-rest-tests-with-security/build.gradle
index 8f02ffb2c3a..acfc4029ec8 100644
--- a/elasticsearch/qa/core-rest-tests-with-security/build.gradle
+++ b/elasticsearch/qa/core-rest-tests-with-security/build.gradle
@@ -34,7 +34,7 @@ integTest {
      'search/80_date_math_index_names/Missing index with catch'].join(',')
 
   cluster {
-    plugin 'x-pack', project(':x-plugins:elasticsearch:x-pack')
+    plugin ':x-plugins:elasticsearch:x-pack'
     setting 'xpack.watcher.enabled', 'false'
     setting 'xpack.monitoring.enabled', 'false'
     setupCommand 'setupDummyUser',
diff --git a/elasticsearch/qa/reindex-tests-with-security/build.gradle b/elasticsearch/qa/reindex-tests-with-security/build.gradle
index be28f4d6e46..3beea6c57f7 100644
--- a/elasticsearch/qa/reindex-tests-with-security/build.gradle
+++ b/elasticsearch/qa/reindex-tests-with-security/build.gradle
@@ -7,7 +7,7 @@ dependencies {
 integTest {
   cluster {
     setting 'script.inline', 'true'
-    plugin 'x-pack', project(':x-plugins:elasticsearch:x-pack')
+    plugin ':x-plugins:elasticsearch:x-pack'
     extraConfigFile 'x-pack/roles.yml', 'roles.yml'
     [
       test_admin: 'superuser',
diff --git a/elasticsearch/qa/security-client-tests/build.gradle b/elasticsearch/qa/security-client-tests/build.gradle
index 2b0a08397a1..ec4d3ff3c3b 100644
--- a/elasticsearch/qa/security-client-tests/build.gradle
+++ b/elasticsearch/qa/security-client-tests/build.gradle
@@ -14,7 +14,7 @@ project.sourceSets.test.output.dir(outputDir, builtBy: copyXPackPluginProps)
 
 integTest {
   cluster {
-    plugin 'x-pack', project(':x-plugins:elasticsearch:x-pack')
+    plugin ':x-plugins:elasticsearch:x-pack'
     setupCommand 'setupDummyUser',
                  'bin/x-pack/users', 'useradd', 'test_user', '-p', 'changeme', '-r', 'superuser'
     setupCommand 'setupTransportClientUser',
diff --git a/elasticsearch/qa/security-example-realm/build.gradle b/elasticsearch/qa/security-example-realm/build.gradle
index f7081642bee..bc0cba826a4 100644
--- a/elasticsearch/qa/security-example-realm/build.gradle
+++ b/elasticsearch/qa/security-example-realm/build.gradle
@@ -43,7 +43,7 @@ task buildZip(type:Zip, dependsOn: [jar]) {
 
 task integTest(type: org.elasticsearch.gradle.test.RestIntegTestTask, dependsOn: buildZip) {
   cluster {
-    plugin 'x-pack', project(':x-plugins:elasticsearch:x-pack')
+    plugin ':x-plugins:elasticsearch:x-pack'
     setting 'xpack.security.authc.realms.custom.order', '0'
     setting 'xpack.security.authc.realms.custom.type', 'custom'
     setting 'xpack.security.authc.realms.esusers.order', '1'
diff --git a/elasticsearch/qa/security-migrate-tests/build.gradle b/elasticsearch/qa/security-migrate-tests/build.gradle
index 3cc6464e39e..308b4d3961c 100644
--- a/elasticsearch/qa/security-migrate-tests/build.gradle
+++ b/elasticsearch/qa/security-migrate-tests/build.gradle
@@ -7,7 +7,7 @@ dependencies {
 integTest {
   cluster {
     setting 'script.inline', 'true'
-    plugin 'x-pack', project(':x-plugins:elasticsearch:x-pack')
+    plugin ':x-plugins:elasticsearch:x-pack'
     extraConfigFile 'x-pack/roles.yml', 'roles.yml'
     [
       test_admin: 'superuser',
diff --git a/elasticsearch/qa/smoke-test-graph-with-security/build.gradle b/elasticsearch/qa/smoke-test-graph-with-security/build.gradle
index 820f387a853..564b71864cd 100644
--- a/elasticsearch/qa/smoke-test-graph-with-security/build.gradle
+++ b/elasticsearch/qa/smoke-test-graph-with-security/build.gradle
@@ -15,7 +15,7 @@ integTest {
   dependsOn copyGraphRestTests
 
   cluster {
-    plugin 'x-pack', project(':x-plugins:elasticsearch:x-pack')
+    plugin ':x-plugins:elasticsearch:x-pack'
     extraConfigFile 'x-pack/roles.yml', 'roles.yml'
     setupCommand 'setupTestAdminUser',
                  'bin/x-pack/users', 'useradd', 'test_admin', '-p', 'changeme', '-r', 'superuser'
diff --git a/elasticsearch/qa/smoke-test-monitoring-with-security/build.gradle b/elasticsearch/qa/smoke-test-monitoring-with-security/build.gradle
index da9d76bf26c..bbaf3115dc6 100644
--- a/elasticsearch/qa/smoke-test-monitoring-with-security/build.gradle
+++ b/elasticsearch/qa/smoke-test-monitoring-with-security/build.gradle
@@ -17,7 +17,7 @@ subprojects {
 
     cluster {
       systemProperty 'es.logger.level', 'TRACE'
-      plugin 'x-pack', project(':x-plugins:elasticsearch:x-pack')
+      plugin ':x-plugins:elasticsearch:x-pack'
       setting 'xpack.monitoring.collection.interval', '3s'
       extraConfigFile 'x-pack/roles.yml', '../roles.yml'
       setupCommand 'setupTestAdminUser',
diff --git a/elasticsearch/qa/smoke-test-plugins-ssl/build.gradle b/elasticsearch/qa/smoke-test-plugins-ssl/build.gradle
index fa3c5c588d3..d83db1a8deb 100644
--- a/elasticsearch/qa/smoke-test-plugins-ssl/build.gradle
+++ b/elasticsearch/qa/smoke-test-plugins-ssl/build.gradle
@@ -147,7 +147,7 @@ processTestResources.dependsOn(
 ext.pluginsCount = 1 // we install xpack explicitly
 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
-  integTest.cluster.plugin(subproj.name, project(subproj.path))
+  integTest.cluster.plugin(subproj.path)
   pluginsCount += 1
 }
 
@@ -166,7 +166,7 @@ integTest {
     setting 'xpack.security.ssl.keystore.path', nodeKeystore.name
     setting 'xpack.security.ssl.keystore.password', 'keypass'
 
-    plugin 'x-pack', project(':x-plugins:elasticsearch:x-pack')
+    plugin ':x-plugins:elasticsearch:x-pack'
 
     // copy keystores into config/
     extraConfigFile nodeKeystore.name, nodeKeystore
diff --git a/elasticsearch/qa/smoke-test-plugins/build.gradle b/elasticsearch/qa/smoke-test-plugins/build.gradle
index 4cb7890e84b..23330418e49 100644
--- a/elasticsearch/qa/smoke-test-plugins/build.gradle
+++ b/elasticsearch/qa/smoke-test-plugins/build.gradle
@@ -9,13 +9,13 @@ dependencies {
 ext.pluginsCount = 1 // we install xpack explicitly
 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
-  integTest.cluster.plugin(subproj.name, project(subproj.path))
+  integTest.cluster.plugin(subproj.path)
   pluginsCount += 1
 }
 
 integTest {
   cluster {
-    plugin 'x-pack', project(':x-plugins:elasticsearch:x-pack')
+    plugin ':x-plugins:elasticsearch:x-pack'
 
     setupCommand 'setupDummyUser',
                  'bin/x-pack/users', 'useradd', 'test_user', '-p', 'changeme', '-r', 'superuser'
diff --git a/elasticsearch/qa/smoke-test-watcher-with-groovy/build.gradle b/elasticsearch/qa/smoke-test-watcher-with-groovy/build.gradle
index 22b8d482a14..75056113f39 100644
--- a/elasticsearch/qa/smoke-test-watcher-with-groovy/build.gradle
+++ b/elasticsearch/qa/smoke-test-watcher-with-groovy/build.gradle
@@ -7,7 +7,7 @@ dependencies {
 
 integTest {
   cluster {
-    plugin 'x-pack', project(':x-plugins:elasticsearch:x-pack')
+    plugin ':x-plugins:elasticsearch:x-pack'
     setting 'script.inline', 'true'
     setting 'xpack.security.enabled', 'false'
     setting 'xpack.monitoring.enabled', 'false'
diff --git a/elasticsearch/qa/smoke-test-watcher-with-mustache/build.gradle b/elasticsearch/qa/smoke-test-watcher-with-mustache/build.gradle
index 25831523b34..180295f0419 100644
--- a/elasticsearch/qa/smoke-test-watcher-with-mustache/build.gradle
+++ b/elasticsearch/qa/smoke-test-watcher-with-mustache/build.gradle
@@ -7,7 +7,7 @@ dependencies {
 
 integTest {
   cluster {
-    plugin 'x-pack', project(':x-plugins:elasticsearch:x-pack')
+    plugin ':x-plugins:elasticsearch:x-pack'
     setting 'xpack.security.enabled', 'false'
     setting 'xpack.monitoring.enabled', 'false'
     setting 'http.port', '9400'
diff --git a/elasticsearch/qa/smoke-test-watcher-with-painless/build.gradle b/elasticsearch/qa/smoke-test-watcher-with-painless/build.gradle
index 6f5114e88f0..239ca2f60dd 100644
--- a/elasticsearch/qa/smoke-test-watcher-with-painless/build.gradle
+++ b/elasticsearch/qa/smoke-test-watcher-with-painless/build.gradle
@@ -7,7 +7,7 @@ dependencies {
 
 integTest {
   cluster {
-    plugin 'x-pack', project(':x-plugins:elasticsearch:x-pack')
+    plugin ':x-plugins:elasticsearch:x-pack'
     setting 'script.inline', 'true'
     setting 'xpack.security.enabled', 'false'
     setting 'xpack.monitoring.enabled', 'false'
diff --git a/elasticsearch/qa/smoke-test-watcher-with-security/build.gradle b/elasticsearch/qa/smoke-test-watcher-with-security/build.gradle
index 235cee460df..e0d5f8501d6 100644
--- a/elasticsearch/qa/smoke-test-watcher-with-security/build.gradle
+++ b/elasticsearch/qa/smoke-test-watcher-with-security/build.gradle
@@ -19,7 +19,7 @@ integTest {
      'getting_started/10_monitor_cluster_health/Getting started - Monitor cluster health'].join(',')
 
   cluster {
-    plugin 'x-pack', project(':x-plugins:elasticsearch:x-pack')
+    plugin ':x-plugins:elasticsearch:x-pack'
     extraConfigFile 'x-pack/roles.yml', 'roles.yml'
     setupCommand 'setupTestAdminUser',
                  'bin/x-pack/users', 'useradd', 'test_admin', '-p', 'changeme', '-r', 'superuser'
diff --git a/elasticsearch/qa/smoke-test-watcher/build.gradle b/elasticsearch/qa/smoke-test-watcher/build.gradle
index 1d7e1486d31..e8b5bbea9dd 100644
--- a/elasticsearch/qa/smoke-test-watcher/build.gradle
+++ b/elasticsearch/qa/smoke-test-watcher/build.gradle
@@ -6,7 +6,7 @@ dependencies {
 
 integTest {
   cluster {
-    plugin 'x-pack', project(':x-plugins:elasticsearch:x-pack')
+    plugin ':x-plugins:elasticsearch:x-pack'
     setting 'xpack.security.enabled', 'false'
     setting 'xpack.monitoring.enabled', 'false'
     setting 'http.port', '9400'