github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-04-24 23:27:25 -04:00
Code Issues Projects Releases Packages Wiki Activity

Remove MavenFilteringHack (#73637) (#75550)

Browse source 
Co-authored-by: Jake Landis <jake.landis@elastic.co>
This commit is contained in:
Joe Gallo 2021-07-21 09:25:36 -04:00 • committed by GitHub
parent d02a481f1f
commit ce98a62427
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
44 changed files with 160 additions and 177 deletions
Download patch file Download diff file Expand all files Collapse all files

5
plugins/discovery-ec2/qa/amazon-ec2/build.gradle
View file

@ -6,8 +6,7 @@
* Side Public License, v 1.
*/
import org.elasticsearch.gradle.internal.MavenFilteringHack
import org.apache.tools.ant.filters.ReplaceTokens
import org.elasticsearch.gradle.internal.info.BuildParams
import org.elasticsearch.gradle.internal.test.AntFixture
import org.elasticsearch.gradle.internal.test.RestIntegTestTask
@ -35,7 +34,7 @@ Map<String, Object> expansions = [
tasks.named("processYamlRestTestResources").configure {
inputs.properties(expansions)
MavenFilteringHack.filter(it, expansions)
filter("tokens" : expansions.collectEntries {k, v -> [k, v.toString()]} /* must be a map of strings */, ReplaceTokens.class)
}
// disable default yamlRestTest task, use spezialized ones below

4
plugins/discovery-ec2/qa/amazon-ec2/src/yamlRestTest/resources/rest-api-spec/test/discovery_ec2/10_basic.yml
View file

@ -3,7 +3,7 @@ setup:
- do:
cluster.health:
wait_for_status: green
wait_for_nodes: ${expected_nodes}
wait_for_nodes: @expected_nodes@
---
"All nodes are correctly discovered":
@ -12,4 +12,4 @@ setup:
nodes.info:
metric: [ transport ]
- match: { _nodes.total: ${expected_nodes} }
- match: { _nodes.total: @expected_nodes@ }