Readd MP module and setting to MP-only tests

Author: nielsbauman

test/external-modules/multi-project/src/javaRestTest/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsMultiProjectIT.java

@@ -35,6 +35,8 @@ public class ClusterStatsMultiProjectIT extends MultiProjectRestTestCase {
     public static ElasticsearchCluster cluster = ElasticsearchCluster.local()
         .nodes(1)
         .distribution(DistributionType.INTEG_TEST)
+        .module("test-multi-project")
+        .setting("test.multi_project.enabled", "true")
         .setting("xpack.security.enabled", "true")
         .user("admin", PASSWORD)
         .build();

test/external-modules/multi-project/src/javaRestTest/java/org/elasticsearch/action/admin/indices/IndexMultiProjectCRUDIT.java

@@ -45,6 +45,8 @@ public class IndexMultiProjectCRUDIT extends MultiProjectRestTestCase {
     private static ElasticsearchCluster createCluster() {
         LocalClusterSpecBuilder<ElasticsearchCluster> clusterBuilder = ElasticsearchCluster.local()
             .nodes(NODE_NUM)
+            .module("test-multi-project")
+            .setting("test.multi_project.enabled", "true")
             .setting("xpack.security.enabled", "false") // TODO multi-project: make this test suite work with Security enabled
             .setting("xpack.ml.enabled", "false"); // TODO multi-project: make this test suite work with ML enabled
         return clusterBuilder.build();

test/external-modules/multi-project/src/javaRestTest/java/org/elasticsearch/action/index/IndexDocumentMultiProjectIT.java

@@ -41,6 +41,8 @@ public class IndexDocumentMultiProjectIT extends MultiProjectRestTestCase {
     private static ElasticsearchCluster createCluster() {
         LocalClusterSpecBuilder<ElasticsearchCluster> clusterBuilder = ElasticsearchCluster.local()
             .nodes(NODE_NUM)
+            .module("test-multi-project")
+            .setting("test.multi_project.enabled", "true")
             .setting("xpack.security.enabled", "false") // TODO multi-project: make this test suite work with Security enabled
             .setting("xpack.ml.enabled", "false"); // TODO multi-project: make this test suite work with ML enabled
         return clusterBuilder.build();

test/external-modules/multi-project/src/javaRestTest/java/org/elasticsearch/multiproject/MultiProjectClusterStateActionIT.java

@@ -26,6 +26,7 @@ public class MultiProjectClusterStateActionIT extends MultiProjectRestTestCase {
     @ClassRule
     public static ElasticsearchCluster CLUSTER = ElasticsearchCluster.local()
         .distribution(DistributionType.DEFAULT)
+        .setting("test.multi_project.enabled", "true")
         .setting("xpack.security.http.ssl.enabled", "false")
         .setting("xpack.security.enabled", "false")
         .build();

test/external-modules/multi-project/src/javaRestTest/java/org/elasticsearch/multiproject/MultiProjectRestartIT.java

@@ -24,6 +24,7 @@ public class MultiProjectRestartIT extends MultiProjectRestTestCase {
     @ClassRule
     public static ElasticsearchCluster CLUSTER = ElasticsearchCluster.local()
         .distribution(DistributionType.DEFAULT)
+        .setting("test.multi_project.enabled", "true")
         .setting("xpack.security.http.ssl.enabled", "false")
         .setting("xpack.security.enabled", "false")
         .build();

test/external-modules/multi-project/src/javaRestTest/java/org/elasticsearch/multiproject/action/ProjectCrudActionIT.java

@@ -36,6 +36,7 @@ public class ProjectCrudActionIT extends MultiProjectRestTestCase {
     @ClassRule
     public static ElasticsearchCluster CLUSTER = ElasticsearchCluster.local()
         .distribution(DistributionType.DEFAULT)
+        .setting("test.multi_project.enabled", "true")
         .setting("xpack.security.enabled", "false")
         .build();
 

test/external-modules/multi-project/src/javaRestTest/java/org/elasticsearch/xpack/security/SecurityRolesMultiProjectIT.java

@@ -41,6 +41,8 @@ public class SecurityRolesMultiProjectIT extends MultiProjectRestTestCase {
     public static ElasticsearchCluster cluster = ElasticsearchCluster.local()
         .nodes(1)
         .distribution(DistributionType.DEFAULT)
+        .module("test-multi-project")
+        .setting("test.multi_project.enabled", "true")
         .setting("xpack.security.enabled", "true")
         .user("admin", PASSWORD)
         .rolesFile(rolesFile)

x-pack/plugin/security/qa/multi-project/src/javaRestTest/java/org/elasticsearch/xpack/security/authc/jwt/JwtMultiProjectIT.java

@@ -50,6 +50,8 @@ public class JwtMultiProjectIT extends ESRestTestCase {
     public static ElasticsearchCluster cluster = ElasticsearchCluster.local()
         .nodes(1)
         .distribution(DistributionType.DEFAULT)
+        .module("test-multi-project")
+        .setting("test.multi_project.enabled", "true")
         .configFile("jwkset.json", Resource.fromClasspath("jwk/jwkset.json"))
         .setting("xpack.ml.enabled", "false")
         .setting("xpack.license.self_generated.type", "trial")

x-pack/qa/multi-project/core-rest-tests-with-multiple-projects/src/yamlRestTest/java/org/elasticsearch/multiproject/test/CoreWithMultipleProjectsClientYamlTestSuiteIT.java

@@ -34,8 +34,10 @@ public class CoreWithMultipleProjectsClientYamlTestSuiteIT extends MultipleProje
         .module("analysis-common")
         .module("health-shards-availability")
         .module("data-streams")
+        .module("test-multi-project")
         .module("lang-mustache")
         .module("parent-join")
+        .setting("test.multi_project.enabled", "true")
         .setting("xpack.security.enabled", "true")
         .setting("xpack.watcher.enabled", "false")
         .setting("xpack.ml.enabled", "false")

x-pack/qa/multi-project/xpack-rest-tests-with-multiple-projects/src/yamlRestTest/java/org/elasticsearch/multiproject/test/XpackWithMultipleProjectsClientYamlTestSuiteIT.java

@@ -26,6 +26,8 @@ public class XpackWithMultipleProjectsClientYamlTestSuiteIT extends MultipleProj
     public static ElasticsearchCluster cluster = ElasticsearchCluster.local()
         .distribution(DistributionType.DEFAULT)
         .name("yamlRestTest")
+        .module("test-multi-project")
+        .setting("test.multi_project.enabled", "true")
         .setting("xpack.ml.enabled", "true")
         .setting("xpack.security.enabled", "true")
         .setting("xpack.watcher.enabled", "false")