From 4f5c9b52c52b762900af02b79642451aa459dc32 Mon Sep 17 00:00:00 2001 From: Aleksandr Maus Date: Wed, 29 Jan 2020 10:21:15 -0500 Subject: [PATCH] EQL: Enable QA/rest integration tests for snapshot builds only * Related to #51541: [CI] unknown setting [xpack.eql.enabled] in release-tests --- x-pack/plugin/eql/build.gradle | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/x-pack/plugin/eql/build.gradle b/x-pack/plugin/eql/build.gradle index 5f1121c9b83ea..47b66cf7151a6 100644 --- a/x-pack/plugin/eql/build.gradle +++ b/x-pack/plugin/eql/build.gradle @@ -1,3 +1,5 @@ +import org.elasticsearch.gradle.info.BuildParams + evaluationDependsOn(xpackModule('core')) apply plugin: 'elasticsearch.esplugin' @@ -44,13 +46,19 @@ task internalClusterTest(type: Test) { check.dependsOn internalClusterTest -// add all sub-projects of the qa sub-project -gradle.projectsEvaluated { - project.subprojects - .find { it.path == project.path + ":qa" } - .subprojects - .findAll { it.path.startsWith(project.path + ":qa") } - .each { check.dependsOn it.check } +/**************************************************************** + * Enable QA/rest integration tests for snapshot builds only * + * TODO: Enable for all builds upon this feature release * + ****************************************************************/ +if (BuildParams.isSnapshotBuild()) { + // add all sub-projects of the qa sub-project + gradle.projectsEvaluated { + project.subprojects + .find { it.path == project.path + ":qa" } + .subprojects + .findAll { it.path.startsWith(project.path + ":qa") } + .each { check.dependsOn it.check } + } } /**********************************************