From a4f596b20430020da2ed970e0686182f096dca36 Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Tue, 24 Nov 2015 17:41:21 -0500
Subject: [PATCH] get watcher+groovy QA test working again (without hack)

Original commit: elastic/x-pack-elasticsearch@843a5ea6e47239419f9f6c37ef58ba9b5f195673
---
 .../build.gradle                              | 15 +++++++++
 .../integration-tests.xml                     | 32 -------------------
 .../test/watcher_groovy/10_basic.yaml         |  0
 .../test/watcher_groovy/20_minimal_body.yaml  |  0
 .../test/watcher_groovy/30_inline_watch.yaml  |  0
 5 files changed, 15 insertions(+), 32 deletions(-)
 create mode 100644 qa/smoke-test-watcher-with-groovy/build.gradle
 delete mode 100644 qa/smoke-test-watcher-with-groovy/integration-tests.xml
 rename qa/smoke-test-watcher-with-groovy/{ => src/test/resources}/rest-api-spec/test/watcher_groovy/10_basic.yaml (100%)
 rename qa/smoke-test-watcher-with-groovy/{ => src/test/resources}/rest-api-spec/test/watcher_groovy/20_minimal_body.yaml (100%)
 rename qa/smoke-test-watcher-with-groovy/{ => src/test/resources}/rest-api-spec/test/watcher_groovy/30_inline_watch.yaml (100%)

diff --git a/qa/smoke-test-watcher-with-groovy/build.gradle b/qa/smoke-test-watcher-with-groovy/build.gradle
new file mode 100644
index 00000000000..bfbdef34180
--- /dev/null
+++ b/qa/smoke-test-watcher-with-groovy/build.gradle
@@ -0,0 +1,15 @@
+apply plugin: 'elasticsearch.rest-test'
+
+dependencies {
+  testCompile project(path: ':x-plugins:watcher', configuration: 'runtime')
+  testCompile project(path: ':plugins:lang-groovy', configuration: 'runtime')
+}
+
+integTest {
+  cluster {
+    plugin 'license', project(':x-plugins:license:plugin')
+    plugin 'watcher', project(':x-plugins:watcher')
+    plugin 'groovy', project(':plugins:lang-groovy')
+    systemProperty 'es.script.inline', 'on'
+  }
+}
diff --git a/qa/smoke-test-watcher-with-groovy/integration-tests.xml b/qa/smoke-test-watcher-with-groovy/integration-tests.xml
deleted file mode 100644
index db4e3d96a6b..00000000000
--- a/qa/smoke-test-watcher-with-groovy/integration-tests.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ~ ELASTICSEARCH CONFIDENTIAL
-  ~ __________________
-  ~
-  ~  [2014] Elasticsearch Incorporated. All Rights Reserved.
-  ~
-  ~ NOTICE:  All information contained herein is, and remains
-  ~ the property of Elasticsearch Incorporated and its suppliers,
-  ~ if any.  The intellectual and technical concepts contained
-  ~ herein are proprietary to Elasticsearch Incorporated
-  ~ and its suppliers and may be covered by U.S. and Foreign Patents,
-  ~ patents in process, and are protected by trade secret or copyright law.
-  ~ Dissemination of this information or reproduction of this material
-  ~ is strictly forbidden unless prior written permission is obtained
-  ~ from Elasticsearch Incorporated.
-  -->
-
-<project name="smoke-test-watcher-and-groovy"
-         xmlns:ac="antlib:net.sf.antcontrib">
-
-  <import file="${elasticsearch.integ.antfile.default}"/>
-
-  <target name="start-external-cluster-with-watcher-and-groovy" depends="setup-workspace">
-    <sequential>
-      <install-plugin name="license" file="${plugins.dir}/license-${project.version}.zip"/>
-      <install-plugin name="lang-groovy" file="${plugins.dir}/lang-groovy-${project.version}.zip"/>
-      <install-plugin name="watcher" file="${plugins.dir}/watcher-${project.version}.zip"/>
-      <startup-elasticsearch/>
-    </sequential>
-  </target>
-</project>
diff --git a/qa/smoke-test-watcher-with-groovy/rest-api-spec/test/watcher_groovy/10_basic.yaml b/qa/smoke-test-watcher-with-groovy/src/test/resources/rest-api-spec/test/watcher_groovy/10_basic.yaml
similarity index 100%
rename from qa/smoke-test-watcher-with-groovy/rest-api-spec/test/watcher_groovy/10_basic.yaml
rename to qa/smoke-test-watcher-with-groovy/src/test/resources/rest-api-spec/test/watcher_groovy/10_basic.yaml
diff --git a/qa/smoke-test-watcher-with-groovy/rest-api-spec/test/watcher_groovy/20_minimal_body.yaml b/qa/smoke-test-watcher-with-groovy/src/test/resources/rest-api-spec/test/watcher_groovy/20_minimal_body.yaml
similarity index 100%
rename from qa/smoke-test-watcher-with-groovy/rest-api-spec/test/watcher_groovy/20_minimal_body.yaml
rename to qa/smoke-test-watcher-with-groovy/src/test/resources/rest-api-spec/test/watcher_groovy/20_minimal_body.yaml
diff --git a/qa/smoke-test-watcher-with-groovy/rest-api-spec/test/watcher_groovy/30_inline_watch.yaml b/qa/smoke-test-watcher-with-groovy/src/test/resources/rest-api-spec/test/watcher_groovy/30_inline_watch.yaml
similarity index 100%
rename from qa/smoke-test-watcher-with-groovy/rest-api-spec/test/watcher_groovy/30_inline_watch.yaml
rename to qa/smoke-test-watcher-with-groovy/src/test/resources/rest-api-spec/test/watcher_groovy/30_inline_watch.yaml