Convert enrich qa modules to use testclusters.

x-pack/plugin/enrich/qa/rest-with-security/build.gradle

@@ -1,38 +1,18 @@
-import org.elasticsearch.gradle.test.RestIntegTestTask
-
-apply plugin: 'elasticsearch.standalone-test'
+apply plugin: 'elasticsearch.testclusters'
+apply plugin: 'elasticsearch.standalone-rest-test'
+apply plugin: 'elasticsearch.rest-test'
 
 dependencies {
     testCompile project(path: xpackModule('enrich'), configuration: 'runtime')
     testCompile project(path: xpackModule('core'), configuration: 'runtime')
     testCompile project(path: xpackModule('enrich:qa:common'), configuration: 'runtime')}
 
-task restTest(type: RestIntegTestTask) {
-    mustRunAfter(precommit)
-}
-
-restTestCluster {
-    distribution 'default'
+testClusters.integTest  {
+    testDistribution = 'DEFAULT'
+    extraConfigFile 'roles.yml', file('roles.yml')
+    user username: "test_admin", password: "x-pack-test-password", role: "superuser"
+    user username: "test_enrich", password: "x-pack-test-password", role: "enrich_user,integ_test_role"
+    user username: "test_enrich_no_privs", password: "x-pack-test-password", role: "enrich_no_privs"
     setting 'xpack.license.self_generated.type', 'basic'
     setting 'xpack.security.enabled', 'true'
-    extraConfigFile 'roles.yml', 'roles.yml'
-    setupCommand 'setupTestAdmin',
-            'bin/elasticsearch-users', 'useradd', "test_admin", '-p', 'x-pack-test-password', '-r', "superuser"
-    setupCommand 'setupEnrichUser',
-            'bin/elasticsearch-users', 'useradd', "test_enrich", '-p', 'x-pack-test-password', '-r', "enrich_user,integ_test_role"
-    setupCommand 'setupEnrichUserNoPrivs',
-            'bin/elasticsearch-users', 'useradd', "test_enrich_no_privs", '-p', 'x-pack-test-password', '-r', "enrich_no_privs"
-    waitCondition = { node, ant ->
-        File tmpFile = new File(node.cwd, 'wait.success')
-        ant.get(src: "http://${node.httpUri()}/_cluster/health?wait_for_nodes=>=${numNodes}&wait_for_status=yellow",
-                dest: tmpFile.toString(),
-                username: 'test_admin',
-                password: 'x-pack-test-password',
-                ignoreerrors: true,
-                retries: 10)
-        return tmpFile.exists()
-    }
 }
-
-check.dependsOn restTest
-test.enabled = false

x-pack/plugin/enrich/qa/rest/build.gradle

@@ -1,20 +1,13 @@
-import org.elasticsearch.gradle.test.RestIntegTestTask
-
-apply plugin: 'elasticsearch.standalone-test'
+apply plugin: 'elasticsearch.testclusters'
+apply plugin: 'elasticsearch.standalone-rest-test'
+apply plugin: 'elasticsearch.rest-test'
 
 dependencies {
     testCompile project(path: xpackModule('enrich'), configuration: 'runtime')
     testCompile project(path: xpackModule('enrich:qa:common'), configuration: 'runtime')
 }
 
-task restTest(type: RestIntegTestTask) {
-    mustRunAfter(precommit)
-}
-
-restTestCluster {
-    distribution 'default'
+testClusters.integTest  {
+    testDistribution = 'DEFAULT'
     setting 'xpack.license.self_generated.type', 'basic'
 }
-
-check.dependsOn restTest
-test.enabled = false