Skip to content

Commit d9e0fa8

Browse files
authored
Move multi-project module to test tree (#1957)
The multi-project module is actually a testing module, but was included in the modules/ tree for convenience. This commit moves it to `test/external-modules/` which is where it belongs.
1 parent 8f5759e commit d9e0fa8

File tree

27 files changed

+12
-877
lines changed

27 files changed

+12
-877
lines changed

modules/multi-project/src/internalClusterTest/java/org/elasticsearch/reservedstate/service/MultiProjectComponentTemplatesFileSettingsIT.java

Lines changed: 0 additions & 855 deletions
This file was deleted.

modules/multi-project/build.gradle renamed to test/external-modules/multi-project/build.gradle

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,17 @@
11
import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask
22

3+
apply plugin: 'elasticsearch.internal-es-plugin'
34
apply plugin: 'elasticsearch.test-with-dependencies'
4-
apply plugin: 'elasticsearch.internal-cluster-test'
5-
apply plugin: 'elasticsearch.internal-yaml-rest-test'
65
apply plugin: 'elasticsearch.internal-java-rest-test'
7-
apply plugin: 'elasticsearch.yaml-rest-compat-test'
86

97
esplugin {
10-
description = 'The Multi-Project module adds functionality for working with multiple projects in ES (only for internal use).'
8+
description = 'The Multi-Project module adds functionality for working with multiple projects in ES (for testing purposes).'
119
classname = 'org.elasticsearch.multiproject.TestOnlyMultiProjectPlugin'
1210
}
1311

14-
restResources {
15-
restApi {
16-
include '*'
17-
}
18-
}
19-
2012
dependencies {
2113
testImplementation project(path: ':test:test-clusters')
22-
clusterModules project(':modules:multi-project')
14+
clusterModules project(':test:external-modules:test-multi-project')
2315
}
2416

2517
tasks.withType(StandaloneRestIntegTestTask).configureEach {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class ClusterStatsMultiProjectIT extends MultiProjectRestTestCase {
3535
public static ElasticsearchCluster cluster = ElasticsearchCluster.local()
3636
.nodes(1)
3737
.distribution(DistributionType.INTEG_TEST)
38-
.module("multi-project")
38+
.module("test-multi-project")
3939
.setting("multi_project.enabled", "true")
4040
.setting("xpack.security.enabled", "true")
4141
.user("admin", PASSWORD)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ private static ElasticsearchCluster createCluster() {
4747
LocalClusterSpecBuilder<ElasticsearchCluster> clusterBuilder = ElasticsearchCluster.local()
4848
.nodes(NODE_NUM)
4949
.distribution(DistributionType.INTEG_TEST) // TODO multi-project: make this test suite work under the default distrib
50-
.module("multi-project")
50+
.module("test-multi-project")
5151
.setting("multi_project.enabled", "true")
5252
.setting("xpack.security.enabled", "false") // TODO multi-project: make this test suite work with Security enabled
5353
.setting("xpack.ml.enabled", "false"); // TODO multi-project: make this test suite work with ML enabled
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ private static ElasticsearchCluster createCluster() {
4343
LocalClusterSpecBuilder<ElasticsearchCluster> clusterBuilder = ElasticsearchCluster.local()
4444
.nodes(NODE_NUM)
4545
.distribution(DistributionType.INTEG_TEST) // TODO multi-project: make this test suite work under the default distrib
46-
.module("multi-project")
46+
.module("test-multi-project")
4747
.setting("multi_project.enabled", "true")
4848
.setting("xpack.security.enabled", "false") // TODO multi-project: make this test suite work with Security enabled
4949
.setting("xpack.ml.enabled", "false"); // TODO multi-project: make this test suite work with ML enabled
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class SecurityRolesMultiProjectIT extends MultiProjectRestTestCase {
4141
public static ElasticsearchCluster cluster = ElasticsearchCluster.local()
4242
.nodes(1)
4343
.distribution(DistributionType.DEFAULT)
44-
.module("multi-project")
44+
.module("test-multi-project")
4545
.setting("multi_project.enabled", "true")
4646
.setting("xpack.security.enabled", "true")
4747
.user("admin", PASSWORD)

0 commit comments

Comments
 (0)