SQL: Fix running `gradle run` from top-level directory (elastic/x-pack-elasticsearch#3329)

When running `gradle run` at the top level (at least with Gradle 4.4) it
attempts to run multiple instances of the server, causing the run to fail since
they can't both bind to 9200/9300.

This renames the tasks for the `qa` directories to be `runqa` and the task for
the `cli` directory to be `runcli`.

Original commit: elastic/x-pack-elasticsearch@734ab8e132
This commit is contained in:
Lee Hinman 2017-12-15 08:42:18 -07:00 committed by GitHub
parent 49a036cc5f
commit 632c3e8238
4 changed files with 6 additions and 6 deletions

View File

@ -161,7 +161,7 @@ subprojects {
finalizedBy cliFixture.stopTask
}
task run(type: RunTask) {
task runqa(type: RunTask) {
distribution = 'zip'
plugin project(':x-pack-elasticsearch:plugin').path
setting 'xpack.monitoring.enabled', 'false'
@ -170,6 +170,6 @@ subprojects {
setting 'script.max_compilations_rate', '1000/1m'
dependsOn cliFixture
}
run.finalizedBy cliFixture.stopTask
runqa.finalizedBy cliFixture.stopTask
}
}

View File

@ -2,6 +2,6 @@ integTestCluster {
setting 'xpack.security.enabled', 'false'
}
run {
runqa {
setting 'xpack.security.enabled', 'false'
}

View File

@ -43,7 +43,7 @@ subprojects {
"${ -> integTest.nodes[0].homeDir}/logs/${ -> integTest.nodes[0].clusterName }_access.log"
}
run {
runqa {
// Setup auditing so we can use it in some tests
setting 'xpack.security.audit.enabled', 'true'
setting 'xpack.security.audit.outputs', 'logfile'

View File

@ -77,7 +77,7 @@ thirdPartyAudit.excludes = [
'org.mozilla.universalchardet.UniversalDetector'
]
task run {
task runcli {
description = 'Run the CLI and connect to elasticsearch running on 9200'
dependsOn 'assemble'
doLast {
@ -104,4 +104,4 @@ test {
classpath -= configurations.runtime
classpath += jar.outputs.files
dependsOn jar
}
}