Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Switch run task to use real distro #41590

Merged
merged 1 commit into from
May 6, 2019
Merged

Switch run task to use real distro #41590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions buildSrc/src/main/groovy/org/elasticsearch/gradle/plugin/PluginBuildPlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,8 @@ class PluginBuildPlugin extends BuildPlugin {

project.tasks.run.dependsOn(project.tasks.bundlePlugin)
if (isModule) {
project.tasks.run.clusterConfig.module(project)
project.tasks.run.clusterConfig.distribution = System.getProperty(
'run.distribution', 'integ-test-zip'
'run.distribution', isXPackModule ? 'default' : 'oss'
)
} else {
project.tasks.run.clusterConfig.plugin(project.path)
Expand Down
4 changes: 0 additions & 4 deletions x-pack/plugin/ccr/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,6 @@ dependencyLicenses {
ignoreSha 'x-pack-core'
}

run {
plugin xpackModule('core')
}

testingConventions.naming {
IT {
baseClass "org.elasticsearch.xpack.CcrIntegTestCase"
Expand Down
4 changes: 0 additions & 4 deletions x-pack/plugin/data-frame/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ dependencies {
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
}

run {
plugin xpackModule('core')
}

// xpack modules are installed in real clusters as the meta plugin, so
// installing them as individual plugins for integ tests doesn't make sense,
// so we disable integ tests
Expand Down
4 changes: 0 additions & 4 deletions x-pack/plugin/deprecation/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,4 @@ dependencies {
compileOnly "org.elasticsearch.plugin:x-pack-core:${version}"
}

run {
plugin xpackModule('core')
}

integTest.enabled = false
4 changes: 0 additions & 4 deletions x-pack/plugin/graph/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,4 @@ gradle.projectsEvaluated {
.each { check.dependsOn it.check }
}

run {
plugin xpackModule('core')
}

integTest.enabled = false
3 changes: 0 additions & 3 deletions x-pack/plugin/ilm/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,3 @@ gradle.projectsEvaluated {

integTest.enabled = false

run {
plugin xpackModule('core')
}
4 changes: 0 additions & 4 deletions x-pack/plugin/logstash/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,4 @@ dependencies {
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
}

run {
plugin xpackModule('core')
}

integTest.enabled = false
4 changes: 0 additions & 4 deletions x-pack/plugin/ml/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,6 @@ project.afterEvaluate {
}
}

run {
plugin xpackModule('core')
}

// xpack modules are installed in real clusters as the meta plugin, so
// installing them as individual plugins for integ tests doesn't make sense,
// so we disable integ tests
Expand Down
4 changes: 0 additions & 4 deletions x-pack/plugin/monitoring/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,6 @@ dependencyLicenses {
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
// installing them as individual plugins for integ tests doesn't make sense,
// so we disable integ tests
Expand Down
4 changes: 0 additions & 4 deletions x-pack/plugin/rollup/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,4 @@ dependencies {
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
}

run {
plugin xpackModule('core')
}

integTest.enabled = false
4 changes: 0 additions & 4 deletions x-pack/plugin/security/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,10 +301,6 @@ thirdPartyAudit.ignoreMissingClasses(
)


run {
plugin xpackModule('core')
}

test {
/*
* We have to disable setting the number of available processors as tests in the same JVM randomize processors and will step on each
Expand Down
4 changes: 0 additions & 4 deletions x-pack/plugin/watcher/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,6 @@ thirdPartyAudit {
)
}

run {
plugin xpackModule('core')
}

test {
/*
* We have to disable setting the number of available processors as tests in the same JVM randomize processors and will step on each
Expand Down