Add integration test phase for elasticsearch core/

TESTING.asciidoc

@@ -261,7 +261,7 @@ The REST tests are run automatically when executing the maven test command. To r
 REST tests use the following command:
 
 ---------------------------------------------------------------------------
-mvn test -Dtests.filter="@Rest"
+mvn verify -Dtests.filter="@Rest"
 ---------------------------------------------------------------------------
 
 `ElasticsearchRestTests` is the executable test class that runs all the

core/pom.xml

@@ -16,11 +16,6 @@
     <name>Elasticsearch Core</name>
     <description>Elasticsearch - Open Source, Distributed, RESTful Search Engine</description>
 
-
-    <properties>
-        <skip.integ.tests>true</skip.integ.tests>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.hamcrest</groupId>

core/src/test/java/org/elasticsearch/test/rest/Rest0IT.java

@@ -27,8 +27,8 @@ import org.elasticsearch.test.rest.parser.RestTestParseException;
 import java.io.IOException;
 
 /** Rest API tests subset 0 */
-public class Rest0Tests extends ElasticsearchRestTestCase {
+public class Rest0IT extends ElasticsearchRestTestCase {
-    public Rest0Tests(@Name("yaml") RestTestCandidate testCandidate) {
+    public Rest0IT(@Name("yaml") RestTestCandidate testCandidate) {
         super(testCandidate);
     }
     @ParametersFactory

core/src/test/java/org/elasticsearch/test/rest/Rest1IT.java

@@ -27,8 +27,8 @@ import org.elasticsearch.test.rest.parser.RestTestParseException;
 import java.io.IOException;
 
 /** Rest API tests subset 1 */
-public class Rest1Tests extends ElasticsearchRestTestCase {
+public class Rest1IT extends ElasticsearchRestTestCase {
-    public Rest1Tests(@Name("yaml") RestTestCandidate testCandidate) {
+    public Rest1IT(@Name("yaml") RestTestCandidate testCandidate) {
         super(testCandidate);
     }
     @ParametersFactory

core/src/test/java/org/elasticsearch/test/rest/Rest2IT.java

@@ -27,8 +27,8 @@ import org.elasticsearch.test.rest.parser.RestTestParseException;
 import java.io.IOException;
 
 /** Rest API tests subset 2 */
-public class Rest2Tests extends ElasticsearchRestTestCase {
+public class Rest2IT extends ElasticsearchRestTestCase {
-    public Rest2Tests(@Name("yaml") RestTestCandidate testCandidate) {
+    public Rest2IT(@Name("yaml") RestTestCandidate testCandidate) {
         super(testCandidate);
     }
     @ParametersFactory

core/src/test/java/org/elasticsearch/test/rest/Rest3IT.java

@@ -27,8 +27,8 @@ import org.elasticsearch.test.rest.parser.RestTestParseException;
 import java.io.IOException;
 
 /** Rest API tests subset 3 */
-public class Rest3Tests extends ElasticsearchRestTestCase {
+public class Rest3IT extends ElasticsearchRestTestCase {
-    public Rest3Tests(@Name("yaml") RestTestCandidate testCandidate) {
+    public Rest3IT(@Name("yaml") RestTestCandidate testCandidate) {
         super(testCandidate);
     }
     @ParametersFactory

core/src/test/java/org/elasticsearch/test/rest/Rest4IT.java

@@ -27,8 +27,8 @@ import org.elasticsearch.test.rest.parser.RestTestParseException;
 import java.io.IOException;
 
 /** Rest API tests subset 4 */
-public class Rest4Tests extends ElasticsearchRestTestCase {
+public class Rest4IT extends ElasticsearchRestTestCase {
-    public Rest4Tests(@Name("yaml") RestTestCandidate testCandidate) {
+    public Rest4IT(@Name("yaml") RestTestCandidate testCandidate) {
         super(testCandidate);
     }
     @ParametersFactory

core/src/test/java/org/elasticsearch/test/rest/Rest5IT.java

@@ -27,8 +27,8 @@ import org.elasticsearch.test.rest.parser.RestTestParseException;
 import java.io.IOException;
 
 /** Rest API tests subset 5 */
-public class Rest5Tests extends ElasticsearchRestTestCase {
+public class Rest5IT extends ElasticsearchRestTestCase {
-    public Rest5Tests(@Name("yaml") RestTestCandidate testCandidate) {
+    public Rest5IT(@Name("yaml") RestTestCandidate testCandidate) {
         super(testCandidate);
     }
     @ParametersFactory

core/src/test/java/org/elasticsearch/test/rest/Rest6IT.java

@@ -27,8 +27,8 @@ import org.elasticsearch.test.rest.parser.RestTestParseException;
 import java.io.IOException;
 
 /** Rest API tests subset 6 */
-public class Rest6Tests extends ElasticsearchRestTestCase {
+public class Rest6IT extends ElasticsearchRestTestCase {
-    public Rest6Tests(@Name("yaml") RestTestCandidate testCandidate) {
+    public Rest6IT(@Name("yaml") RestTestCandidate testCandidate) {
         super(testCandidate);
     }
     @ParametersFactory

core/src/test/java/org/elasticsearch/test/rest/Rest7IT.java

@@ -27,8 +27,8 @@ import org.elasticsearch.test.rest.parser.RestTestParseException;
 import java.io.IOException;
 
 /** Rest API tests subset 7 */
-public class Rest7Tests extends ElasticsearchRestTestCase {
+public class Rest7IT extends ElasticsearchRestTestCase {
-    public Rest7Tests(@Name("yaml") RestTestCandidate testCandidate) {
+    public Rest7IT(@Name("yaml") RestTestCandidate testCandidate) {
         super(testCandidate);
     }
     @ParametersFactory

distribution/pom.xml

@@ -132,6 +132,23 @@
                         </execution>
                     </executions>
                 </plugin>
+                <plugin>
+                    <groupId>com.carrotsearch.randomizedtesting</groupId>
+                    <artifactId>junit4-maven-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <id>integ-tests</id>
+                            <configuration>
+                                <!-- currently only 1 cpu works, because integ tests don't make "unique" test directories? -->
+                                <parallelism>1</parallelism>
+                                <systemProperties>
+                                    <!-- use external cluster -->
+                                    <tests.cluster>127.0.0.1:9300</tests.cluster>
+                                </systemProperties>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>

plugins/pom.xml

@@ -400,6 +400,23 @@
                         </execution>
                     </executions>
                 </plugin>
+                <plugin>
+                    <groupId>com.carrotsearch.randomizedtesting</groupId>
+                    <artifactId>junit4-maven-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <id>integ-tests</id>
+                            <configuration>
+                                <!-- currently only 1 cpu works, because integ tests don't make "unique" test directories? -->
+                                <parallelism>1</parallelism>
+                                <systemProperties>
+                                    <!-- use external cluster -->
+                                    <tests.cluster>127.0.0.1:9300</tests.cluster>
+                                </systemProperties>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>

pom.xml

@@ -733,16 +733,12 @@
                                         summaryFile="${project.build.directory}/failsafe-reports/failsafe-summary.xml"
                                         dir="${project.build.directory}/failsafe-reports"/>
                                 </listeners>
-                                <!-- currently only 1 cpu works, because integ tests don't make "unique" test directories? -->
-                                <parallelism>1</parallelism>
                                 <includes>
                                     <include>**/*IT.class</include>
                                 </includes>
                                 <systemProperties>
                                     <!-- integ tests are typically slow! -->
                                     <tests.slow>true</tests.slow>
-                                    <!-- use external cluster -->
-                                    <tests.cluster>127.0.0.1:9300</tests.cluster>
                                     <!-- let framework know we are running integ tests, for correct 'reproduce with' line -->
                                     <tests.verify.phase>true</tests.verify.phase>
                                 </systemProperties>