Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refine GRADLE_RERUNNER #8522

Merged
merged 4 commits into from Feb 19, 2019
Merged

Refine GRADLE_RERUNNER #8522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
60a2427
Refine GRADLE_RERUNNER
blindpirate Feb 15, 2019
3d51d03
Let smoke test use applyTestDefaults, too
blindpirate Feb 15, 2019
9a58104
Skip rerunner if there are too many failures
blindpirate Feb 15, 2019
4e7d93e
Polish PR
blindpirate Feb 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .teamcity/Gradle_Check/configurations/FunctionalTest.kt
View file
Open in desktop
Expand Up @@ -23,7 +23,7 @@ class FunctionalTest(model: CIBuildModel, testCoverage: TestCoverage, subProject
"coverageJvmVendor" to testCoverage.vendor.name,
"coverageJvmVersion" to testCoverage.testJvmVersion.name
)
applyDefaults(model, this, testTask, notQuick = !quickTest, os = testCoverage.os,
applyTestDefaults(model, this, testTask, notQuick = !quickTest, os = testCoverage.os,
extraParameters = (
listOf(""""-PtestJavaHome=%${testCoverage.os}.${testCoverage.testJvmVersion}.${testCoverage.vendor}.64bit%"""")
+ buildScanTags.map { buildScanTag(it) }
Expand Down
167 changes: 111 additions & 56 deletions .teamcity/Gradle_Check/configurations/GradleBuildConfigurationDefaults.kt
View file
Open in desktop
Expand Up @@ -24,15 +24,17 @@ fun shouldBeSkipped(subProject: GradleSubproject, testConfig: TestCoverage): Boo
return testConfig.os.ignoredSubprojects.contains(subProject.name)
}

fun gradleParameters(os: OS = OS.linux, daemon: Boolean = true, isContinue: Boolean = true): List<String> =
listOf(
"-PmaxParallelForks=%maxParallelForks%",
"-s",
if (daemon) "--daemon" else "--no-daemon",
if (isContinue) "--continue" else "",
"""-I "%teamcity.build.checkoutDir%/gradle/init-scripts/build-scan.init.gradle.kts"""",
"-Dorg.gradle.internal.tasks.createops",
"-Dorg.gradle.internal.plugins.portal.url.override=http://dev12.gradle.org:8081/artifactory/gradle-plugins/")
fun gradleParameterString(daemon: Boolean = true) = gradleParameters(daemon).joinToString(separator = " ")

fun gradleParameters(daemon: Boolean = true, isContinue: Boolean = true): List<String> =
listOf(
"-PmaxParallelForks=%maxParallelForks%",
"-s",
if (daemon) "--daemon" else "--no-daemon",
if (isContinue) "--continue" else "",
"""-I "%teamcity.build.checkoutDir%/gradle/init-scripts/build-scan.init.gradle.kts"""",
"-Dorg.gradle.internal.tasks.createops",
"-Dorg.gradle.internal.plugins.portal.url.override=http://dev12.gradle.org:8081/artifactory/gradle-plugins/")


val m2CleanScriptUnixLike = """
Expand Down Expand Up @@ -106,74 +108,127 @@ fun ProjectFeatures.buildReportTab(title: String, startPage: String) {
}
}

fun applyDefaults(model: CIBuildModel, buildType: BaseGradleBuildType, gradleTasks: String, notQuick: Boolean = false, os: OS = OS.linux, extraParameters: String = "", timeout: Int = 90, extraSteps: BuildSteps.() -> Unit = {}, daemon: Boolean = true) {
applyDefaultSettings(buildType, os, timeout)
private
fun BaseGradleBuildType.checkCleanM2Step(os: OS = OS.linux) {
steps {
script {
name = "CHECK_CLEAN_M2"
executionMode = BuildStep.ExecutionMode.ALWAYS
scriptContent = if (os == OS.windows) m2CleanScriptWindows else m2CleanScriptUnixLike
}
}
}

val gradleParameterString = gradleParameters(os, daemon).joinToString(separator = " ")

val buildScanTags = model.buildScanTags + listOfNotNull(buildType.stage?.id)

val gradleParamList = listOf(gradleParameterString) +
buildType.buildCache.gradleParameters(os) +
listOf(extraParameters) +
"-PteamCityUsername=%teamcity.username.restbot%" +
"-PteamCityPassword=%teamcity.password.restbot%" +
"-PteamCityBuildId=%teamcity.build.id%" +
buildScanTags.map { buildScanTag(it) }

buildType.steps {
fun addKillProcessStep(stepName: String) {
if (os == OS.windows) {
gradleWrapper {
name = stepName
executionMode = BuildStep.ExecutionMode.ALWAYS
tasks = "killExistingProcessesStartedByGradle"
gradleParams = gradleParameterString
}
private
fun BaseGradleBuildType.verifyTestFilesCleanupStep(daemon: Boolean = true) {
steps {
gradleWrapper {
name = "VERIFY_TEST_FILES_CLEANUP"
tasks = "verifyTestFilesCleanup"
gradleParams = gradleParameterString(daemon)
}
}
}

private
fun BaseGradleBuildType.tagBuildStep(model: CIBuildModel, daemon: Boolean = true) {
steps {
if (model.tagBuilds) {
gradleWrapper {
name = "TAG_BUILD"
executionMode = BuildStep.ExecutionMode.ALWAYS
tasks = "tagBuild"
gradleParams = "${gradleParameterString(daemon)} -PteamCityUsername=%teamcity.username.restbot% -PteamCityPassword=%teamcity.password.restbot% -PteamCityBuildId=%teamcity.build.id% -PgithubToken=%github.ci.oauth.token%"
}
}
}
}

private
fun BaseGradleBuildType.gradleRunnerStep(model: CIBuildModel, gradleTasks: String, os: OS = OS.linux, extraParameters: String = "", daemon: Boolean = true) {
val buildScanTags = model.buildScanTags + listOfNotNull(stage?.id)

steps {
gradleWrapper {
name = "GRADLE_RUNNER"
tasks = "clean $gradleTasks"
gradleParams = gradleParamList.joinToString(separator = " ")
gradleParams = (
listOf(gradleParameterString(daemon)) +
this@gradleRunnerStep.buildCache.gradleParameters(os) +
listOf(extraParameters) +
"-PteamCityUsername=%teamcity.username.restbot%" +
"-PteamCityPassword=%teamcity.password.restbot%" +
"-PteamCityBuildId=%teamcity.build.id%" +
buildScanTags.map { configurations.buildScanTag(it) }
).joinToString(separator = " ")
}
}
}

addKillProcessStep("KILL_PROCESSES_STARTED_BY_GRADLE")
private
fun BaseGradleBuildType.gradleRerunnerStep(model: CIBuildModel, gradleTasks: String, os: OS = OS.linux, extraParameters: String = "", daemon: Boolean = true) {
val buildScanTags = model.buildScanTags + listOfNotNull(stage?.id)

steps {
gradleWrapper {
name = "GRADLE_RERUNNER"
tasks = "$gradleTasks"
tasks = gradleTasks
executionMode = BuildStep.ExecutionMode.RUN_ON_FAILURE
gradleParams = (gradleParamList + "-PonlyPreviousFailedTestClasses=true").joinToString(separator = " ")
gradleParams = (
listOf(gradleParameterString(daemon)) +
this@gradleRerunnerStep.buildCache.gradleParameters(os) +
listOf(extraParameters) +
"-PteamCityUsername=%teamcity.username.restbot%" +
"-PteamCityPassword=%teamcity.password.restbot%" +
"-PteamCityBuildId=%teamcity.build.id%" +
buildScanTags.map { configurations.buildScanTag(it) } +
"-PrerunFailedTests=true"
).joinToString(separator = " ")
}

addKillProcessStep("KILL_PROCESSES_STARTED_BY_GRADLE_RERUN")
}
}

buildType.steps.extraSteps()

buildType.steps {
script {
name = "CHECK_CLEAN_M2"
executionMode = BuildStep.ExecutionMode.ALWAYS
scriptContent = if (os == OS.windows) m2CleanScriptWindows else m2CleanScriptUnixLike
}
gradleWrapper {
name = "VERIFY_TEST_FILES_CLEANUP"
tasks = "verifyTestFilesCleanup"
gradleParams = gradleParameterString
}

if (model.tagBuilds) {
private
fun BaseGradleBuildType.killProcessStepIfNecessary(stepName: String, os: OS = OS.linux, daemon: Boolean = true) {
if (os == OS.windows) {
steps {
gradleWrapper {
name = "TAG_BUILD"
name = stepName
executionMode = BuildStep.ExecutionMode.ALWAYS
tasks = "tagBuild"
gradleParams = "$gradleParameterString -PteamCityUsername=%teamcity.username.restbot% -PteamCityPassword=%teamcity.password.restbot% -PteamCityBuildId=%teamcity.build.id% -PgithubToken=%github.ci.oauth.token%"
tasks = "killExistingProcessesStartedByGradle"
gradleParams = gradleParameterString(daemon)
}
}
}
}

fun applyDefaults(model: CIBuildModel, buildType: BaseGradleBuildType, gradleTasks: String, notQuick: Boolean = false, os: OS = OS.linux, extraParameters: String = "", timeout: Int = 90, extraSteps: BuildSteps.() -> Unit = {}, daemon: Boolean = true) {
applyDefaultSettings(buildType, os, timeout)

buildType.gradleRunnerStep(model, gradleTasks, os, extraParameters, daemon)

buildType.steps.extraSteps()

buildType.checkCleanM2Step(os)
buildType.verifyTestFilesCleanupStep(daemon)
buildType.tagBuildStep(model, daemon)

applyDefaultDependencies(model, buildType, notQuick)
}

fun applyTestDefaults(model: CIBuildModel, buildType: BaseGradleBuildType, gradleTasks: String, notQuick: Boolean = false, os: OS = OS.linux, extraParameters: String = "", timeout: Int = 90, extraSteps: BuildSteps.() -> Unit = {}, daemon: Boolean = true) {
applyDefaultSettings(buildType, os, timeout)

buildType.gradleRunnerStep(model, gradleTasks, os, extraParameters, daemon)
buildType.killProcessStepIfNecessary("KILL_PROCESSES_STARTED_BY_GRADLE", os)
buildType.gradleRerunnerStep(model, gradleTasks, os, extraParameters, daemon)
buildType.killProcessStepIfNecessary("KILL_PROCESSES_STARTED_BY_GRADLE_RERUN", os)

buildType.steps.extraSteps()

buildType.checkCleanM2Step(os)
buildType.verifyTestFilesCleanupStep(daemon)
buildType.tagBuildStep(model, daemon)

applyDefaultDependencies(model, buildType, notQuick)
}
Expand Down
2 changes: 1 addition & 1 deletion .teamcity/Gradle_Check/configurations/SmokeTests.kt
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@ class SmokeTests(model: CIBuildModel, stage: Stage) : BaseGradleBuildType(model,
param("env.JAVA_HOME", buildJavaHome)
}

applyDefaults(
applyTestDefaults(
model,
this,
"smokeTest:smokeTest",
Expand Down