Switch run task to use real distro (#41590)
The run task is supposed to run elasticsearch with the given plugin or module. However, for modules, this is most realistic if using the full distribution. This commit changes the run setup to use the default or oss as appropriate.
This commit is contained in:
parent
2cdd75e2c8
commit
6fd8924c5a
|
@ -99,9 +99,8 @@ class PluginBuildPlugin extends BuildPlugin {
|
||||||
|
|
||||||
project.tasks.run.dependsOn(project.tasks.bundlePlugin)
|
project.tasks.run.dependsOn(project.tasks.bundlePlugin)
|
||||||
if (isModule) {
|
if (isModule) {
|
||||||
project.tasks.run.clusterConfig.module(project)
|
|
||||||
project.tasks.run.clusterConfig.distribution = System.getProperty(
|
project.tasks.run.clusterConfig.distribution = System.getProperty(
|
||||||
'run.distribution', 'integ-test-zip'
|
'run.distribution', isXPackModule ? 'default' : 'oss'
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
project.tasks.run.clusterConfig.plugin(project.path)
|
project.tasks.run.clusterConfig.plugin(project.path)
|
||||||
|
|
|
@ -59,10 +59,6 @@ dependencyLicenses {
|
||||||
ignoreSha 'x-pack-core'
|
ignoreSha 'x-pack-core'
|
||||||
}
|
}
|
||||||
|
|
||||||
run {
|
|
||||||
plugin xpackModule('core')
|
|
||||||
}
|
|
||||||
|
|
||||||
testingConventions.naming {
|
testingConventions.naming {
|
||||||
IT {
|
IT {
|
||||||
baseClass "org.elasticsearch.xpack.CcrIntegTestCase"
|
baseClass "org.elasticsearch.xpack.CcrIntegTestCase"
|
||||||
|
|
|
@ -15,10 +15,6 @@ dependencies {
|
||||||
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
|
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
|
||||||
}
|
}
|
||||||
|
|
||||||
run {
|
|
||||||
plugin xpackModule('core')
|
|
||||||
}
|
|
||||||
|
|
||||||
// xpack modules are installed in real clusters as the meta plugin, so
|
// xpack modules are installed in real clusters as the meta plugin, so
|
||||||
// installing them as individual plugins for integ tests doesn't make sense,
|
// installing them as individual plugins for integ tests doesn't make sense,
|
||||||
// so we disable integ tests
|
// so we disable integ tests
|
||||||
|
|
|
@ -13,8 +13,4 @@ dependencies {
|
||||||
compileOnly "org.elasticsearch.plugin:x-pack-core:${version}"
|
compileOnly "org.elasticsearch.plugin:x-pack-core:${version}"
|
||||||
}
|
}
|
||||||
|
|
||||||
run {
|
|
||||||
plugin xpackModule('core')
|
|
||||||
}
|
|
||||||
|
|
||||||
integTest.enabled = false
|
integTest.enabled = false
|
||||||
|
|
|
@ -24,8 +24,4 @@ gradle.projectsEvaluated {
|
||||||
.each { check.dependsOn it.check }
|
.each { check.dependsOn it.check }
|
||||||
}
|
}
|
||||||
|
|
||||||
run {
|
|
||||||
plugin xpackModule('core')
|
|
||||||
}
|
|
||||||
|
|
||||||
integTest.enabled = false
|
integTest.enabled = false
|
||||||
|
|
|
@ -29,6 +29,3 @@ gradle.projectsEvaluated {
|
||||||
|
|
||||||
integTest.enabled = false
|
integTest.enabled = false
|
||||||
|
|
||||||
run {
|
|
||||||
plugin xpackModule('core')
|
|
||||||
}
|
|
||||||
|
|
|
@ -15,8 +15,4 @@ dependencies {
|
||||||
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
|
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
|
||||||
}
|
}
|
||||||
|
|
||||||
run {
|
|
||||||
plugin xpackModule('core')
|
|
||||||
}
|
|
||||||
|
|
||||||
integTest.enabled = false
|
integTest.enabled = false
|
||||||
|
|
|
@ -94,10 +94,6 @@ project.afterEvaluate {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
run {
|
|
||||||
plugin xpackModule('core')
|
|
||||||
}
|
|
||||||
|
|
||||||
// xpack modules are installed in real clusters as the meta plugin, so
|
// xpack modules are installed in real clusters as the meta plugin, so
|
||||||
// installing them as individual plugins for integ tests doesn't make sense,
|
// installing them as individual plugins for integ tests doesn't make sense,
|
||||||
// so we disable integ tests
|
// so we disable integ tests
|
||||||
|
|
|
@ -45,10 +45,6 @@ dependencyLicenses {
|
||||||
mapping from: /commons-.*/, to: 'commons' // pulled in by rest client
|
mapping from: /commons-.*/, to: 'commons' // pulled in by rest client
|
||||||
}
|
}
|
||||||
|
|
||||||
run {
|
|
||||||
plugin xpackModule('core')
|
|
||||||
}
|
|
||||||
|
|
||||||
// xpack modules are installed in real clusters as the meta plugin, so
|
// xpack modules are installed in real clusters as the meta plugin, so
|
||||||
// installing them as individual plugins for integ tests doesn't make sense,
|
// installing them as individual plugins for integ tests doesn't make sense,
|
||||||
// so we disable integ tests
|
// so we disable integ tests
|
||||||
|
|
|
@ -21,8 +21,4 @@ dependencies {
|
||||||
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
|
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
|
||||||
}
|
}
|
||||||
|
|
||||||
run {
|
|
||||||
plugin xpackModule('core')
|
|
||||||
}
|
|
||||||
|
|
||||||
integTest.enabled = false
|
integTest.enabled = false
|
||||||
|
|
|
@ -302,10 +302,6 @@ if (project.runtimeJavaVersion > JavaVersion.VERSION_1_8) {
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
run {
|
|
||||||
plugin xpackModule('core')
|
|
||||||
}
|
|
||||||
|
|
||||||
test {
|
test {
|
||||||
/*
|
/*
|
||||||
* We have to disable setting the number of available processors as tests in the same JVM randomize processors and will step on each
|
* We have to disable setting the number of available processors as tests in the same JVM randomize processors and will step on each
|
||||||
|
|
|
@ -111,10 +111,6 @@ if (project.runtimeJavaVersion <= JavaVersion.VERSION_1_8) {
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
run {
|
|
||||||
plugin xpackModule('core')
|
|
||||||
}
|
|
||||||
|
|
||||||
test {
|
test {
|
||||||
/*
|
/*
|
||||||
* We have to disable setting the number of available processors as tests in the same JVM randomize processors and will step on each
|
* We have to disable setting the number of available processors as tests in the same JVM randomize processors and will step on each
|
||||||
|
|
Loading…
Reference in New Issue