BIGTOP-2259. Check for smoke-test projects should be generalized
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/815908d4 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/815908d4 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/815908d4 Branch: refs/heads/master Commit: 815908d433baf9a754c74e26ac2aafe883fe800a Parents: 6a18518 Author: Konstantin Boudnik <[email protected]> Authored: Mon Jan 18 23:41:42 2016 -0800 Committer: Konstantin Boudnik <[email protected]> Committed: Tue Jan 19 13:54:16 2016 -0800 ---------------------------------------------------------------------- build.gradle | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/815908d4/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index 5064cb5..c74b9a7 100644 --- a/build.gradle +++ b/build.gradle @@ -182,13 +182,14 @@ project(':itest-common') { * This is done to avoid running cluster smoke tests during the normal life-cycle * of the project development */ -def checkSmokeTestProjects = { - FileTree fTree = fileTree(dir: 'bigtop-tests/smoke-tests', include: '*/build.gradle') +def checkClusterTestProjects = { property -> + def suiteName = property.replaceAll('.', '-') + FileTree fTree = fileTree(dir: "bigtop-tests/$suiteName", include: '*/build.gradle') fTree.each() { smokeProject -> def parent = smokeProject.getParentFile().name - project (":bigtop-tests:smoke-tests:$parent") { + project (":bigtop-tests:$suiteName:$parent") { test { - onlyIf {project.hasProperty('smoke.tests')} + onlyIf {project.hasProperty(suiteName)} } } } @@ -412,7 +413,7 @@ task "bigtop-slaves"(dependsOn: 'gen-gradle-home', type:Exec, } project.afterEvaluate { - checkSmokeTestProjects() + checkClusterTestProjects("smoke.tests") artifactToInstall(dependsOn: [installTopLevel, installCommon, installConf, installiTest]) }
