Move watcher REST tests that require groovy to smoke-test-watcher-with-groovy
See https://github.com/elastic/x-plugins/issues/724 Original commit: elastic/x-pack-elasticsearch@ab95aef8e3
This commit is contained in:
Robert Muir
parent
15bb2581a0
commit
9e9b835213
|
|
@ -308,6 +308,7 @@
|
||||||
<module>smoke-test-plugins-ssl</module>-->
|
<module>smoke-test-plugins-ssl</module>-->
|
||||||
<module>shield-core-rest-tests</module>
|
<module>shield-core-rest-tests</module>
|
||||||
<module>smoke-test-watcher-with-shield</module>
|
<module>smoke-test-watcher-with-shield</module>
|
||||||
|
<module>smoke-test-watcher-with-groovy</module>
|
||||||
<module>shield-example-realm</module>
|
<module>shield-example-realm</module>
|
||||||
<module>shield-tribe-node-tests</module>
|
<module>shield-tribe-node-tests</module>
|
||||||
<module>shield-client-tests</module>
|
<module>shield-client-tests</module>
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,32 @@
|
||||||
|
<?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>
|
||||||
|
|
@ -0,0 +1,188 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
|
||||||
|
<!--
|
||||||
|
~ 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 xmlns="http://maven.apache.org/POM/4.0.0"
|
||||||
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
<parent>
|
||||||
|
<groupId>org.elasticsearch.qa</groupId>
|
||||||
|
<artifactId>x-plugins-qa</artifactId>
|
||||||
|
<version>3.0.0-SNAPSHOT</version>
|
||||||
|
</parent>
|
||||||
|
|
||||||
|
<artifactId>smoke-test-watcher-with-groovy</artifactId>
|
||||||
|
<name>QA: Smoke Test Watcher's Groovy integration</name>
|
||||||
|
<description>Installs Watcher and runs some REST tests that use groovy scripting</description>
|
||||||
|
|
||||||
|
<properties>
|
||||||
|
<skip.unit.tests>true</skip.unit.tests>
|
||||||
|
<elasticsearch.integ.antfile>${project.basedir}/integration-tests.xml</elasticsearch.integ.antfile>
|
||||||
|
<tests.rest.suite>watcher_groovy</tests.rest.suite>
|
||||||
|
<tests.rest.load_packaged>false</tests.rest.load_packaged>
|
||||||
|
</properties>
|
||||||
|
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.elasticsearch.plugin</groupId>
|
||||||
|
<artifactId>license</artifactId>
|
||||||
|
<version>${elasticsearch.version}</version>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.elasticsearch.plugin</groupId>
|
||||||
|
<artifactId>watcher</artifactId>
|
||||||
|
<version>${project.version}</version>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
|
||||||
|
<build>
|
||||||
|
<testResources>
|
||||||
|
<!-- Core REST API specification -->
|
||||||
|
<testResource>
|
||||||
|
<directory>${elasticsearch.tools.directory}/rest-api-spec</directory>
|
||||||
|
<targetPath>rest-api-spec</targetPath>
|
||||||
|
<includes>
|
||||||
|
<!-- required by the test framework -->
|
||||||
|
<include>api/info.json</include>
|
||||||
|
<include>api/cluster.health.json</include>
|
||||||
|
<include>api/cluster.state.json</include>
|
||||||
|
</includes>
|
||||||
|
</testResource>
|
||||||
|
<!-- Watcher REST API specification -->
|
||||||
|
<testResource>
|
||||||
|
<directory>../../watcher/src/test/resources/rest-api-spec</directory>
|
||||||
|
<filtering>true</filtering>
|
||||||
|
<targetPath>rest-api-spec</targetPath>
|
||||||
|
<includes>
|
||||||
|
<include>api/*.json</include>
|
||||||
|
</includes>
|
||||||
|
</testResource>
|
||||||
|
<!-- Tests -->
|
||||||
|
<testResource>
|
||||||
|
<directory>${project.basedir}/rest-api-spec</directory>
|
||||||
|
<filtering>true</filtering>
|
||||||
|
<targetPath>rest-api-spec</targetPath>
|
||||||
|
<includes>
|
||||||
|
<include>test/**/*.yaml</include>
|
||||||
|
</includes>
|
||||||
|
</testResource>
|
||||||
|
</testResources>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-dependency-plugin</artifactId>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<id>integ-setup-dependencies</id>
|
||||||
|
<phase>pre-integration-test</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>copy</goal>
|
||||||
|
</goals>
|
||||||
|
<configuration>
|
||||||
|
<skip>${skip.integ.tests}</skip>
|
||||||
|
<useBaseVersion>true</useBaseVersion>
|
||||||
|
<outputDirectory>${integ.deps}/plugins</outputDirectory>
|
||||||
|
|
||||||
|
<artifactItems>
|
||||||
|
<!-- elasticsearch distribution -->
|
||||||
|
<artifactItem>
|
||||||
|
<groupId>org.elasticsearch.distribution.zip</groupId>
|
||||||
|
<artifactId>elasticsearch</artifactId>
|
||||||
|
<version>${elasticsearch.version}</version>
|
||||||
|
<type>zip</type>
|
||||||
|
<overWrite>true</overWrite>
|
||||||
|
<outputDirectory>${integ.deps}</outputDirectory>
|
||||||
|
</artifactItem>
|
||||||
|
|
||||||
|
<!-- commercial plugins -->
|
||||||
|
<artifactItem>
|
||||||
|
<groupId>org.elasticsearch.plugin</groupId>
|
||||||
|
<artifactId>license</artifactId>
|
||||||
|
<version>${elasticsearch.version}</version>
|
||||||
|
<type>zip</type>
|
||||||
|
<overWrite>true</overWrite>
|
||||||
|
</artifactItem>
|
||||||
|
|
||||||
|
<artifactItem>
|
||||||
|
<groupId>org.elasticsearch.plugin</groupId>
|
||||||
|
<artifactId>watcher</artifactId>
|
||||||
|
<version>${elasticsearch.version}</version>
|
||||||
|
<type>zip</type>
|
||||||
|
<overWrite>true</overWrite>
|
||||||
|
</artifactItem>
|
||||||
|
|
||||||
|
<!-- groovy scripting plugin -->
|
||||||
|
<artifactItem>
|
||||||
|
<groupId>org.elasticsearch.plugin</groupId>
|
||||||
|
<artifactId>lang-groovy</artifactId>
|
||||||
|
<version>${elasticsearch.version}</version>
|
||||||
|
<type>zip</type>
|
||||||
|
<overWrite>true</overWrite>
|
||||||
|
</artifactItem>
|
||||||
|
|
||||||
|
</artifactItems>
|
||||||
|
</configuration>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
<!-- integration tests -->
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-antrun-plugin</artifactId>
|
||||||
|
<executions>
|
||||||
|
<!-- start up external cluster -->
|
||||||
|
<execution>
|
||||||
|
<id>integ-setup</id>
|
||||||
|
<phase>pre-integration-test</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>run</goal>
|
||||||
|
</goals>
|
||||||
|
<configuration>
|
||||||
|
<target>
|
||||||
|
<ant antfile="${elasticsearch.integ.antfile}" target="start-external-cluster-with-watcher-and-groovy">
|
||||||
|
<property name="tests.jvm.argline" value="${tests.jvm.argline}"/>
|
||||||
|
<property name="plugins.dir" location="${integ.deps}/plugins"/>
|
||||||
|
</ant>
|
||||||
|
</target>
|
||||||
|
<skip>${skip.integ.tests}</skip>
|
||||||
|
</configuration>
|
||||||
|
</execution>
|
||||||
|
<!-- shut down external cluster -->
|
||||||
|
<execution>
|
||||||
|
<id>integ-teardown</id>
|
||||||
|
<phase>post-integration-test</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>run</goal>
|
||||||
|
</goals>
|
||||||
|
<configuration>
|
||||||
|
<target>
|
||||||
|
<ant antfile="${elasticsearch.integ.antfile}" target="stop-external-cluster"/>
|
||||||
|
</target>
|
||||||
|
<skip>${skip.integ.tests}</skip>
|
||||||
|
</configuration>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
|
||||||
|
</project>
|
||||||
|
|
@ -0,0 +1,81 @@
|
||||||
|
/*
|
||||||
|
* 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 com.carrotsearch.randomizedtesting.annotations.Name;
|
||||||
|
import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
|
||||||
|
import org.apache.http.client.methods.HttpPut;
|
||||||
|
import org.apache.http.impl.client.CloseableHttpClient;
|
||||||
|
import org.apache.http.impl.client.HttpClients;
|
||||||
|
import org.apache.http.impl.conn.BasicHttpClientConnectionManager;
|
||||||
|
import org.elasticsearch.common.network.NetworkAddress;
|
||||||
|
import org.elasticsearch.common.settings.Settings;
|
||||||
|
import org.elasticsearch.license.plugin.LicensePlugin;
|
||||||
|
import org.elasticsearch.node.Node;
|
||||||
|
import org.elasticsearch.test.ESIntegTestCase.ClusterScope;
|
||||||
|
import org.elasticsearch.test.junit.annotations.TestLogging;
|
||||||
|
import org.elasticsearch.test.rest.ESRestTestCase;
|
||||||
|
import org.elasticsearch.test.rest.RestTestCandidate;
|
||||||
|
import org.elasticsearch.test.rest.parser.RestTestParseException;
|
||||||
|
import org.elasticsearch.watcher.WatcherPlugin;
|
||||||
|
import org.junit.After;
|
||||||
|
import org.junit.Before;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.net.InetSocketAddress;
|
||||||
|
import java.net.URI;
|
||||||
|
|
||||||
|
import static org.elasticsearch.test.ESIntegTestCase.Scope.SUITE;
|
||||||
|
|
||||||
|
|
||||||
|
@ESRestTestCase.Rest
|
||||||
|
@ClusterScope(scope = SUITE, numClientNodes = 1, transportClientRatio = 0, numDataNodes = 1, randomDynamicTemplates = false)
|
||||||
|
@TestLogging("_root:DEBUG")
|
||||||
|
public abstract class WatcherRestTestCase extends ESRestTestCase {
|
||||||
|
|
||||||
|
public WatcherRestTestCase(@Name("yaml") RestTestCandidate testCandidate) {
|
||||||
|
super(testCandidate);
|
||||||
|
}
|
||||||
|
|
||||||
|
@ParametersFactory
|
||||||
|
public static Iterable<Object[]> parameters() throws IOException, RestTestParseException {
|
||||||
|
return ESRestTestCase.createParameters(0, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void startWatcher() throws Exception {
|
||||||
|
try(CloseableHttpClient client = HttpClients.createMinimal(new BasicHttpClientConnectionManager())) {
|
||||||
|
InetSocketAddress address = cluster().httpAddresses()[0];
|
||||||
|
HttpPut request = new HttpPut(new URI("http", null, NetworkAddress.formatAddress(address.getAddress()), address.getPort(), "/_watcher/_start", null, null));
|
||||||
|
client.execute(request);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@After
|
||||||
|
public void stopWatcher() throws Exception {
|
||||||
|
try(CloseableHttpClient client = HttpClients.createMinimal(new BasicHttpClientConnectionManager())) {
|
||||||
|
InetSocketAddress address = cluster().httpAddresses()[0];
|
||||||
|
HttpPut request = new HttpPut(new URI("http", null, NetworkAddress.formatAddress(address.getAddress()), address.getPort(), "/_watcher/_stop", null, null));
|
||||||
|
client.execute(request);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected Settings nodeSettings(int nodeOrdinal) {
|
||||||
|
return Settings.builder()
|
||||||
|
.put(super.nodeSettings(nodeOrdinal))
|
||||||
|
.put(Node.HTTP_ENABLED, true)
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected Settings transportClientSettings() {
|
||||||
|
return Settings.builder()
|
||||||
|
.put(Node.HTTP_ENABLED, true)
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,17 @@
|
||||||
|
/*
|
||||||
|
* 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 WatcherWithGroovyIT extends WatcherRestTestCase {
|
||||||
|
|
||||||
|
public WatcherWithGroovyIT(RestTestCandidate testCandidate) {
|
||||||
|
super(testCandidate);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue