Skip to content

Commit e853338

Browse files
committed
Migrate legacy QA projects to new test clusters framework (#125545)
1 parent 385db6a commit e853338

File tree

60 files changed

+151
-98
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+151
-98
lines changed

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/RestrictedBuildApiService.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,6 @@ private static ListMultimap<Class<?>, String> createLegacyRestTestBasePluginUsag
5656
map.put(LegacyRestTestBasePlugin.class, ":qa:remote-clusters");
5757
map.put(LegacyRestTestBasePlugin.class, ":qa:repository-multi-version");
5858
map.put(LegacyRestTestBasePlugin.class, ":qa:rolling-upgrade-legacy");
59-
map.put(LegacyRestTestBasePlugin.class, ":qa:smoke-test-http");
60-
map.put(LegacyRestTestBasePlugin.class, ":qa:smoke-test-ingest-disabled");
61-
map.put(LegacyRestTestBasePlugin.class, ":qa:smoke-test-ingest-with-all-dependencies");
62-
map.put(LegacyRestTestBasePlugin.class, ":qa:smoke-test-plugins");
63-
map.put(LegacyRestTestBasePlugin.class, ":qa:system-indices");
6459
map.put(LegacyRestTestBasePlugin.class, ":test:external-modules:test-apm-integration");
6560
map.put(LegacyRestTestBasePlugin.class, ":test:external-modules:test-delayed-aggs");
6661
map.put(LegacyRestTestBasePlugin.class, ":test:external-modules:test-die-with-dignity");

qa/smoke-test-http/build.gradle

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,12 @@
77
* License v3.0 only", or the "Server Side Public License, v 1".
88
*/
99

10-
apply plugin: 'elasticsearch.legacy-java-rest-test'
11-
//apply plugin: 'elasticsearch.test-with-dependencies'
10+
apply plugin: 'elasticsearch.internal-cluster-test'
11+
apply plugin: 'elasticsearch.internal-java-rest-test'
1212

1313
dependencies {
14-
javaRestTestImplementation "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}"
15-
javaRestTestImplementation project(':modules:rest-root')
16-
}
17-
18-
testClusters.configureEach {
19-
module ':modules:rest-root'
20-
setting 'xpack.security.enabled', 'false'
14+
internalClusterTestImplementation project(":test:framework")
15+
internalClusterTestImplementation "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}"
16+
internalClusterTestImplementation project(':modules:rest-root')
17+
clusterModules project(":modules:rest-root")
2118
}

0 commit comments

Comments
 (0)