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

Emergency revert to make bump 7.15.0 (#13037)

Browse source 
Revert "Change Gradle's :logstash-integration-tests:integrationTests task to depends on copyES (#12847) (#12868)"

This reverts commit 5287e7740e.
This commit is contained in:
Andrea Selva 2021-06-30 20:24:36 +02:00 • committed by GitHub
parent c081985782
commit 2ce40ced1b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
build.gradle
View file

@ -530,6 +530,7 @@ tasks.register("downloadEs", Download) {
onlyIfNewer true onlyIfNewer true
retries 3 retries 3
inputs.file("${projectDir}/versions.yml") inputs.file("${projectDir}/versions.yml")
// inputs.file("${projectDir}/build/${downloadedElasticsearchName}.tar.gz.SHA-512")
outputs.file(project.ext.elasticsearchDownloadLocation) outputs.file(project.ext.elasticsearchDownloadLocation)
dest new File(project.ext.elasticsearchDownloadLocation) dest new File(project.ext.elasticsearchDownloadLocation)
@ -551,6 +552,7 @@ tasks.register("copyEs", Copy) {
file("./build/${project.ext.unpackedElasticsearchName}").renameTo('./build/elasticsearch') file("./build/${project.ext.unpackedElasticsearchName}").renameTo('./build/elasticsearch')
System.out.println "Unzipped ${project.ext.elasticsearchDownloadLocation} to ./build/elasticsearch" System.out.println "Unzipped ${project.ext.elasticsearchDownloadLocation} to ./build/elasticsearch"
System.out.println "Deleting ${project.ext.elasticsearchDownloadLocation}" System.out.println "Deleting ${project.ext.elasticsearchDownloadLocation}"
// delete(project.ext.elasticsearchDownloadLocation)
} }
} }
@ -563,12 +565,12 @@ project(":logstash-integration-tests") {
environment "FEATURE_FLAG", System.getenv('FEATURE_FLAG') environment "FEATURE_FLAG", System.getenv('FEATURE_FLAG')
workingDir integrationTestPwd workingDir integrationTestPwd
dependsOn installIntegrationTestGems dependsOn installIntegrationTestGems
dependsOn copyEs
} }
} }
tasks.register("runIntegrationTests"){ tasks.register("runIntegrationTests"){
dependsOn tasks.getByPath(":logstash-integration-tests:integrationTests") dependsOn tasks.getByPath(":logstash-integration-tests:integrationTests")
dependsOn copyEs
dependsOn copyFilebeat dependsOn copyFilebeat
shouldRunAfter ":logstash-core:test" shouldRunAfter ":logstash-core:test"
} }