honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[7.x] Move Watcher config out of RestResourcesPlugin (#55136) (#55336)

This commit is contained in:
Jake Landis 2020-04-17 12:38:01 -05:00 committed by GitHub
parent a49ce45f1b
commit eb30cf5c89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/RestResourcesPlugin.java
View File

@ -89,7 +89,7 @@ public class RestResourcesPlugin implements Plugin<Project> {
// tests // tests
Configuration testConfig = project.getConfigurations().create("restTestConfig"); Configuration testConfig = project.getConfigurations().create("restTestConfig");
Configuration xpackTestConfig = project.getConfigurations().create("restXpackTest"); Configuration xpackTestConfig = project.getConfigurations().create("restXpackTestConfig");
project.getConfigurations().create("restTests"); project.getConfigurations().create("restTests");
project.getConfigurations().create("restXpackTests"); project.getConfigurations().create("restXpackTests");
Provider<CopyRestTestsTask> copyRestYamlTestTask = project.getTasks() Provider<CopyRestTestsTask> copyRestYamlTestTask = project.getTasks()
@ -108,10 +108,6 @@ public class RestResourcesPlugin implements Plugin<Project> {
.project(Map.of("path", ":x-pack:plugin", "configuration", "restXpackTests")); .project(Map.of("path", ":x-pack:plugin", "configuration", "restXpackTests"));
project.getDependencies().add(task.xpackConfig.getName(), restXPackTestdependency); project.getDependencies().add(task.xpackConfig.getName(), restXPackTestdependency);
task.dependsOn(task.xpackConfig); task.dependsOn(task.xpackConfig);
// watcher
Dependency restWatcherTests = project.getDependencies()
.project(Map.of("path", ":x-pack:plugin:watcher:qa:rest", "configuration", "restXpackTests"));
project.getDependencies().add(task.xpackConfig.getName(), restWatcherTests);
} else { } else {
Dependency dependency = project.getDependencies() Dependency dependency = project.getDependencies()
.create("org.elasticsearch:rest-api-spec:" + VersionProperties.getElasticsearch()); .create("org.elasticsearch:rest-api-spec:" + VersionProperties.getElasticsearch());

1
x-pack/plugin/watcher/qa/with-security/build.gradle
View File

@ -5,6 +5,7 @@ apply plugin: 'elasticsearch.rest-test'
dependencies { dependencies {
testCompile project(':x-pack:qa') testCompile project(':x-pack:qa')
testCompile project(path: ':x-pack:plugin:watcher:qa:rest', configuration: 'testArtifacts') testCompile project(path: ':x-pack:plugin:watcher:qa:rest', configuration: 'testArtifacts')
restXpackTestConfig project(path: ':x-pack:plugin:watcher:qa:rest', configuration: 'restXpackTests')
} }
restResources { restResources {