diff --git a/dev-tools/integration-tests.xml b/dev-tools/integration-tests.xml new file mode 100644 index 00000000000..ad09092e52f --- /dev/null +++ b/dev-tools/integration-tests.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + Installing license plugin... + + + + + + Installing plugin ${project.artifactId}... + + + + Starting up external cluster... + + + + + + + + External cluster started PID ${integ.pid} + + diff --git a/pom.xml b/pom.xml index d15a7d4d7e3..55e358ba380 100644 --- a/pom.xml +++ b/pom.xml @@ -16,13 +16,15 @@ - org.elasticsearch + org.elasticsearch.plugin elasticsearch-plugin 2.0.0-SNAPSHOT + dev-tools/elasticsearch_license_header.txt dev-tools/license_header_definition.xml + dev-tools/integration-tests.xml 2.0.0-SNAPSHOT 2.0.0-SNAPSHOT false @@ -87,6 +89,14 @@ test + + org.elasticsearch + elasticsearch-license-plugin + ${license.plugin.version} + zip + test + + com.github.spullara.mustache.java diff --git a/src/test/java/org/elasticsearch/watcher/test/rest/WatcherRestIT.java b/src/test/java/org/elasticsearch/watcher/test/rest/WatcherRestIT.java new file mode 100644 index 00000000000..9e282ddef54 --- /dev/null +++ b/src/test/java/org/elasticsearch/watcher/test/rest/WatcherRestIT.java @@ -0,0 +1,21 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +package org.elasticsearch.watcher.test.rest; + +import org.elasticsearch.test.rest.RestTestCandidate; + +/** Runs rest tests against external cluster */ +public class WatcherRestIT extends WatcherRestTests { + + public WatcherRestIT(RestTestCandidate testCandidate) { + super(testCandidate); + } + + @Override + protected boolean enableShield() { + return false; + } +}