test: skip discovery ec2 in smoke-test-plugins*

Until we can fix the shield settings, we have bugs where we depend on the iteration
order of a map and discovery ec2 settings provoke this (most likely through a map
resize).

See elastic/elasticsearch#1520

Original commit: elastic/x-pack-elasticsearch@fbc32cf069
This commit is contained in:
jaymode 2016-02-12 10:40:27 -05:00
parent ec76d3bce0
commit 8337832405
2 changed files with 10 additions and 4 deletions

View File

@ -39,8 +39,11 @@ processTestResources.dependsOn(createKey)
ext.pluginsCount = 1 // we install xpack explicitly
project.rootProject.subprojects.findAll { it.path.startsWith(':plugins:') }.each { subproj ->
// need to get a non-decorated project object, so must re-lookup the project by path
integTest.cluster.plugin(subproj.name, project(subproj.path))
pluginsCount += 1
// FIXME - fix shield settings to not rely on iteration order so this doesn't break!
if (subproj.name.equals("discovery-ec2") == false) {
integTest.cluster.plugin(subproj.name, project(subproj.path))
pluginsCount += 1
}
}
integTest {

View File

@ -9,8 +9,11 @@ dependencies {
ext.pluginsCount = 1 // we install xpack explicitly
project.rootProject.subprojects.findAll { it.path.startsWith(':plugins:') }.each { subproj ->
// need to get a non-decorated project object, so must re-lookup the project by path
integTest.cluster.plugin(subproj.name, project(subproj.path))
pluginsCount += 1
// FIXME - fix shield settings to not rely on iteration order so this doesn't break!
if (subproj.name.equals("discovery-ec2") == false) {
integTest.cluster.plugin(subproj.name, project(subproj.path))
pluginsCount += 1
}
}
integTest {