Skip to content

Commit 9a0ddc0

Browse files
authored
[8.x] Migrate legacy QA projects to new test clusters framework (elastic#125545) (elastic#125717)
* Migrate legacy QA projects to new test clusters framework (elastic#125545) (cherry picked from commit 0388a59) # Conflicts: # qa/smoke-test-ingest-with-all-dependencies/src/yamlRestTest/resources/rest-api-spec/test/ingest/90_deprecation_warnings_on_invalid_names_ingest.yml * Fix test * Add missing module * No need to run with security
1 parent 68eabd7 commit 9a0ddc0

File tree

58 files changed

+142
-91
lines changed

Some content is hidden

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

58 files changed

+142
-91
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
@@ -36,11 +36,6 @@ private static ListMultimap<Class<?>, String> createLegacyRestTestBasePluginUsag
3636
map.put(LegacyRestTestBasePlugin.class, ":qa:remote-clusters");
3737
map.put(LegacyRestTestBasePlugin.class, ":qa:repository-multi-version");
3838
map.put(LegacyRestTestBasePlugin.class, ":qa:rolling-upgrade-legacy");
39-
map.put(LegacyRestTestBasePlugin.class, ":qa:smoke-test-http");
40-
map.put(LegacyRestTestBasePlugin.class, ":qa:smoke-test-ingest-disabled");
41-
map.put(LegacyRestTestBasePlugin.class, ":qa:smoke-test-ingest-with-all-dependencies");
42-
map.put(LegacyRestTestBasePlugin.class, ":qa:smoke-test-plugins");
43-
map.put(LegacyRestTestBasePlugin.class, ":qa:system-indices");
4439
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:core");
4540
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:ent-search");
4641
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:fleet");

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)