github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-06-28 09:28:55 -04:00
Code Issues Projects Releases Packages Wiki Activity

Ensure APM module is always installed in release test clusters (#89223)

Browse source
This commit is contained in:
Mark Vieira 2022-08-10 09:04:40 -07:00 • committed by GitHub
parent 399a8ac283
commit c0019a3ff6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
distribution/build.gradle
View file

@ -177,7 +177,7 @@ project.rootProject.subprojects.findAll { it.parent.path == ':modules' }.each {
} }
distro.copyModule(processDefaultOutputsTaskProvider, module) distro.copyModule(processDefaultOutputsTaskProvider, module)
if (module.name.startsWith('transport-')) { if (module.name.startsWith('transport-') || (BuildParams.snapshotBuild == false && module.name == 'apm')) {
distro.copyModule(processIntegTestOutputsTaskProvider, module) distro.copyModule(processIntegTestOutputsTaskProvider, module)
} }

7
qa/apm/build.gradle
View file

@ -8,7 +8,9 @@
import org.elasticsearch.gradle.Architecture import org.elasticsearch.gradle.Architecture
import org.elasticsearch.gradle.VersionProperties import org.elasticsearch.gradle.VersionProperties
import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.DOCKER; import org.elasticsearch.gradle.internal.info.BuildParams
import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.DOCKER
apply plugin: 'elasticsearch.standalone-rest-test' apply plugin: 'elasticsearch.standalone-rest-test'
apply plugin: 'elasticsearch.test.fixtures' apply plugin: 'elasticsearch.test.fixtures'
@ -21,8 +23,7 @@ dependencies {
} }
dockerCompose { dockerCompose {
environment.put 'STACK_VERSION', VersionProperties.elasticsearch environment.put 'STACK_VERSION', BuildParams.snapshotBuild ? VersionProperties.elasticsearch : VersionProperties.elasticsearch + "-SNAPSHOT"
// retainContainersOnStartupFailure = true
} }
elasticsearch_distributions { elasticsearch_distributions {