Skip to content

Commit

Permalink
Build: Pull "skip assemble on qa" to common build (#35214)
Browse files Browse the repository at this point in the history
Pull all of the logic that we use to skip the `assemble` and
`dependenciesInfo` tasks on `qa` projects into one spot in our root
build file.
  • Loading branch information
nik9000 committed Nov 5, 2018
1 parent 1c7c6de commit d722535
Show file tree
Hide file tree
Showing 8 changed files with 5 additions and 87 deletions.
8 changes: 5 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -559,11 +559,13 @@ wrapper {
}
}

/* Remove assemble/dependenciesInfo on all qa projects because we don't need to publish
* artifacts for them. */
gradle.projectsEvaluated {
subprojects {
if (project.path.startsWith(':qa')) {
/*
* Remove assemble/dependenciesInfo on all qa projects because we don't
* need to publish artifacts for them.
*/
if (project.name.equals('qa') || project.path.contains(':qa:')) {
Task assemble = project.tasks.findByName('assemble')
if (assemble) {
assemble.enabled = false
Expand Down
11 changes: 0 additions & 11 deletions x-pack/plugin/ccr/qa/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,3 @@ subprojects {
}
}
}

/* Remove assemble on all qa projects because we don't need to publish
* artifacts for them. */
gradle.projectsEvaluated {
subprojects {
Task assemble = project.tasks.findByName('assemble')
if (assemble) {
assemble.enabled = false
}
}
}
13 changes: 0 additions & 13 deletions x-pack/plugin/graph/qa/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,3 @@ subprojects {
}
}
}

gradle.projectsEvaluated {
subprojects {
Task assemble = project.tasks.findByName('assemble')
if (assemble) {
assemble.enabled = false
}
Task dependenciesInfo = project.tasks.findByName('dependenciesInfo')
if (dependenciesInfo) {
dependenciesInfo.enabled = false
}
}
}
12 changes: 0 additions & 12 deletions x-pack/plugin/ilm/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,6 @@ gradle.projectsEvaluated {
.each { check.dependsOn it.check }
}


/* Remove assemble on all qa projects because we don't need to publish
* artifacts for them. */
gradle.projectsEvaluated {
subprojects {
Task assemble = project.tasks.findByName('assemble')
if (assemble) {
assemble.enabled = false
}
}
}

integTest.enabled = false

run {
Expand Down
11 changes: 0 additions & 11 deletions x-pack/plugin/ilm/qa/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,5 @@ subprojects {
}
}

/* Remove assemble on all qa projects because we don't need to publish
* artifacts for them. */
gradle.projectsEvaluated {
subprojects {
Task assemble = project.tasks.findByName('assemble')
if (assemble) {
assemble.enabled = false
}
}
}

// the qa modules does not have any source files
licenseHeaders.enabled = false
13 changes: 0 additions & 13 deletions x-pack/plugin/ml/qa/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,3 @@ subprojects {
}
}
}

gradle.projectsEvaluated {
subprojects {
Task assemble = project.tasks.findByName('assemble')
if (assemble) {
assemble.enabled = false
}
Task dependenciesInfo = project.tasks.findByName('dependenciesInfo')
if (dependenciesInfo) {
dependenciesInfo.enabled = false
}
}
}
9 changes: 0 additions & 9 deletions x-pack/plugin/sql/qa/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -125,13 +125,4 @@ subprojects {
setting 'script.max_compilations_rate', '1000/1m'
}
}

Task assemble = project.tasks.findByName('assemble')
if (assemble) {
assemble.enabled = false
}
Task dependenciesInfo = project.tasks.findByName('dependenciesInfo')
if (dependenciesInfo) {
dependenciesInfo.enabled = false
}
}
15 changes: 0 additions & 15 deletions x-pack/qa/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,3 @@ subprojects {
}
}
}

/* Remove assemble on all qa projects because we don't need to publish
* artifacts for them. */
gradle.projectsEvaluated {
subprojects {
Task assemble = project.tasks.findByName('assemble')
if (assemble) {
assemble.enabled = false
}
Task dependenciesInfo = project.tasks.findByName('dependenciesInfo')
if (dependenciesInfo) {
dependenciesInfo.enabled = false
}
}
}

0 comments on commit d722535

Please sign in to comment.