github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 22:57:16 -04:00
Code Issues Projects Releases Packages Wiki Activity

Ensure more gradle tasks using task avoidance API

Browse source 
Release Manager builds were failing as `downloadEs` task was being
needlessly run during `rake artifact:all` task. When run with
`RELEASE=1`. this was causing build failures due to the non-availability
of Elasticsearch release artifacts. This commit aims to avoid running
the `downloadES` task when it is not needed, continuing the work done
in #11914

This commit also removes code that was repeated in different parts of
the build script.
This commit is contained in:
Rob Bavey 2020-07-13 14:41:38 -04:00 • committed by Robert Bavey
parent 8e750ccd08
commit b2c652bf9d
2 changed files with 9 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

21
build.gradle
View file

@ -450,12 +450,9 @@ tasks.register("runIntegrationTests"){
dependsOn tasks.getByPath(":logstash-integration-tests:integrationTests") dependsOn tasks.getByPath(":logstash-integration-tests:integrationTests")
dependsOn copyEs dependsOn copyEs
dependsOn copyFilebeat dependsOn copyFilebeat
shouldRunAfter ":logstash-core:test"
} }
bootstrap.dependsOn assemblyDeps
runIntegrationTests.shouldRunAfter tasks.getByPath(":logstash-core:test")
check.dependsOn runIntegrationTests
tasks.register("generateLicenseReport", JavaExec) { tasks.register("generateLicenseReport", JavaExec) {
@ -506,11 +503,8 @@ tasks.register("generatePluginsVersion") {
} }
bootstrap.dependsOn assemblyDeps bootstrap.dependsOn assemblyDeps
runIntegrationTests.shouldRunAfter tasks.getByPath(":logstash-core:test")
check.dependsOn runIntegrationTests check.dependsOn runIntegrationTests
Boolean oss = System.getenv('OSS').equals('true') Boolean oss = System.getenv('OSS').equals('true')
if (!oss) { if (!oss) {
@ -520,11 +514,12 @@ if (!oss) {
dependsOn installTestGems dependsOn installTestGems
} }
} }
tasks.getByPath(":logstash-xpack:rubyIntegrationTests").configure {
dependsOn copyEs
}
} }
task runXPackUnitTests(dependsOn: [tasks.getByPath(":logstash-xpack:rubyTests")]) {}
task runXPackIntegrationTests(dependsOn: [tasks.getByPath(":logstash-xpack:rubyIntegrationTests")]) {}
} }
tasks.register("runXPackUnitTests"){
dependsOn ":logstash-xpack:rubyTests"
}
tasks.register("runXPackIntegrationTests"){
dependsOn ":logstash-xpack:rubyIntegrationTests"
}

1
x-pack/build.gradle
View file

@ -35,6 +35,7 @@ tasks.register("rubyTests", Test) {
} }
tasks.register("rubyIntegrationTests", Test) { tasks.register("rubyIntegrationTests", Test) {
dependsOn (":copyEs")
inputs.files fileTree("${projectDir}/qa") inputs.files fileTree("${projectDir}/qa")
inputs.files fileTree("${projectDir}/lib") inputs.files fileTree("${projectDir}/lib")
inputs.files fileTree("${projectDir}/modules") inputs.files fileTree("${projectDir}/modules")