Move sql rest test into qa (elastic/x-pack-elasticsearch#2149)

Running the sql rest action test inside the server caused a dependency
loop which was failing the build.

Original commit: elastic/x-pack-elasticsearch@43283671d8

dev-tools/ci

@@ -53,9 +53,11 @@ case $key in
             "-psql"
             "check"
             ":x-pack-elasticsearch:plugin:precommit"
+            ":x-pack-elasticsearch:qa:sql-no-security:check"
             ":x-pack-elasticsearch:qa:sql-security:check"
             "-xforbiddenPatterns"
             "-x:x-pack-elasticsearch:plugin:forbiddenPatterns"
+            "-x:x-pack-elasticsearch:qa:sql-no-security:forbiddenPatterns"
             "-x:x-pack-elasticsearch:qa:sql-security:forbiddenPatterns"
         )
         ;;

qa/sql-no-security/build.gradle

@@ -0,0 +1,28 @@
+import org.elasticsearch.gradle.test.RunTask
+
+apply plugin: 'elasticsearch.standalone-rest-test'
+apply plugin: 'elasticsearch.rest-test'
+
+integTestCluster {
+  distribution = 'zip' // NOCOMMIT make double sure we want all the modules
+  plugin project(':x-pack-elasticsearch:plugin').path
+  /* Get a "clean" test without the other x-pack features here and check them
+   * all together later on. */
+  setting 'xpack.security.enabled', 'false'
+  setting 'xpack.monitoring.enabled', 'false'
+  setting 'xpack.ml.enabled', 'false'
+  setting 'xpack.watcher.enabled', 'false'
+  setting 'script.max_compilations_per_minute', '1000'
+}
+
+task run(type: RunTask) {
+  distribution = 'zip' // NOCOMMIT make double sure we want all the modules
+  plugin project(':x-pack-elasticsearch:plugin').path
+  /* Get a "clean" test without the other x-pack features here and check them
+   * all together later on. */
+  setting 'xpack.security.enabled', 'false'
+  setting 'xpack.monitoring.enabled', 'false'
+  setting 'xpack.ml.enabled', 'false'
+  setting 'xpack.watcher.enabled', 'false'
+  setting 'script.max_compilations_per_minute', '1000'
+}

qa/sql-no-security/src/test/java/org/elasticsearch/xpack/sql/RestSqlIT.java

@@ -3,7 +3,7 @@
  * 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.xpack.sql.server;
+package org.elasticsearch.xpack.sql;
 
 import org.elasticsearch.client.Response;
 import org.elasticsearch.client.ResponseException;

sql/server/build.gradle

@@ -26,38 +26,6 @@ dependencyLicenses {
 compileJava.options.compilerArgs << "-parameters"
 compileTestJava.options.compilerArgs << "-parameters"
 
-// Configure integration tests
-apply plugin: 'elasticsearch.rest-test'
-integTest.mustRunAfter test
-gradle.projectsEvaluated {
-  // Hack to remove a dependency cycle
-  project(':x-pack-elasticsearch:plugin').test.mustRunAfter.getDependencies(project(':x-pack-elasticsearch:plugin').test).remove(test)
-}
-
-integTestCluster {
-  distribution = 'zip' // NOCOMMIT make double sure we want all the modules
-  plugin project(':x-pack-elasticsearch:plugin').path
-  /* Get a "clean" test without the other x-pack features here and check them
-   * all together later on. */
-  setting 'xpack.security.enabled', 'false'
-  setting 'xpack.monitoring.enabled', 'false'
-  setting 'xpack.ml.enabled', 'false'
-  setting 'xpack.watcher.enabled', 'false'
-  setting 'script.max_compilations_per_minute', '1000'
-}
-
-task run(type: RunTask) {
-  distribution = 'zip' // NOCOMMIT make double sure we want all the modules
-  plugin project(':x-pack-elasticsearch:plugin').path
-  /* Get a "clean" test without the other x-pack features here and check them
-   * all together later on. */
-  setting 'xpack.security.enabled', 'false'
-  setting 'xpack.monitoring.enabled', 'false'
-  setting 'xpack.ml.enabled', 'false'
-  setting 'xpack.watcher.enabled', 'false'
-  setting 'script.max_compilations_per_minute', '1000'
-}
-
 /**********************************************
  *          SQL Parser regeneration           *
  **********************************************/