Skip to content

Commit 2e12bbb

Browse files
authored
Migrate discovery-ec2 QA tests to javaRestTest (#119384) (#120511)
No need for all this Gradle magic any more, we can just test the discovery behaviour directly using Java REST tests.
1 parent ff3f731 commit 2e12bbb

File tree

23 files changed

+965
-425
lines changed

23 files changed

+965
-425
lines changed

plugins/discovery-ec2/build.gradle

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ dependencies {
3131
api "joda-time:joda-time:2.10.10"
3232

3333
javaRestTestImplementation project(':plugins:discovery-ec2')
34+
javaRestTestImplementation project(':test:fixtures:aws-fixture-utils')
35+
javaRestTestImplementation project(':test:fixtures:aws-ec2-fixture')
3436
javaRestTestImplementation project(':test:fixtures:ec2-imds-fixture')
3537

3638
internalClusterTestImplementation project(':test:fixtures:ec2-imds-fixture')
@@ -101,11 +103,6 @@ tasks.withType(Test).configureEach {
101103
}
102104
}
103105

104-
tasks.named("check").configure {
105-
// also execute the QA tests when testing the plugin
106-
dependsOn 'qa:amazon-ec2:check'
107-
}
108-
109106
tasks.named("thirdPartyAudit").configure {
110107
ignoreMissingClasses(
111108
// classes are missing

plugins/discovery-ec2/qa/amazon-ec2/build.gradle

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

plugins/discovery-ec2/qa/amazon-ec2/src/yamlRestTest/java/org/elasticsearch/discovery/ec2/AmazonEC2DiscoveryClientYamlTestSuiteIT.java

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

0 commit comments

Comments
 (0)