Skip to content

Commit c10a294

Browse files
authored
Merge pull request #312 from gradle/wolfs/add-trigger-build
Add a trigger build to run all tests
2 parents 394d202 + 2269d0a commit c10a294

File tree

4 files changed

+40
-15
lines changed

4 files changed

+40
-15
lines changed

.teamcity/settings.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ To debug in IntelliJ Idea, open the 'Maven Projects' tool window (View
2323
import jetbrains.buildServer.configs.kotlin.v2019_2.project
2424
import jetbrains.buildServer.configs.kotlin.v2019_2.version
2525

26-
version = "2020.1"
26+
version = "2020.2"
2727

2828
project {
2929
configureGradleProfilerProject()

.teamcity/settings/GradleProfilerTest.kt

-10
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.commitStatusPu
44
import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
55
import jetbrains.buildServer.configs.kotlin.v2019_2.failureConditions.BuildFailureOnText
66
import jetbrains.buildServer.configs.kotlin.v2019_2.failureConditions.failOnText
7-
import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs
87
import jetbrains.buildServer.configs.kotlin.v2019_2.ui.add
98

109
open class GradleProfilerTest(os: Os, javaVersion: JavaVersion) : BuildType({
@@ -23,15 +22,6 @@ open class GradleProfilerTest(os: Os, javaVersion: JavaVersion) : BuildType({
2322
}
2423
}
2524

26-
triggers {
27-
vcs {
28-
branchFilter = """
29-
+:*
30-
-:pull/*
31-
""".trimIndent()
32-
}
33-
}
34-
3525
features {
3626
commitStatusPublisher {
3727
vcsRootExtId = "${DslContext.settingsRoot.id}"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
2+
import jetbrains.buildServer.configs.kotlin.v2019_2.FailureAction
3+
import jetbrains.buildServer.configs.kotlin.v2019_2.ReuseBuilds
4+
import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs
5+
6+
class GradleProfilerTestTrigger(testBuilds: List<BuildType>) : BuildType({
7+
name = "Tests (Trigger)"
8+
9+
gradleProfilerVcs()
10+
triggers {
11+
vcs {
12+
branchFilter = """
13+
+:*
14+
-:pull/*
15+
""".trimIndent()
16+
}
17+
}
18+
19+
agentRequirement(Os.linux)
20+
21+
dependencies {
22+
testBuilds.forEach {
23+
snapshot(it) {
24+
reuseBuilds = ReuseBuilds.SUCCESSFUL
25+
onDependencyCancel = FailureAction.CANCEL
26+
onDependencyFailure = FailureAction.ADD_PROBLEM
27+
}
28+
}
29+
}
30+
})

.teamcity/settings/root-project.kt

+9-4
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,16 @@ import jetbrains.buildServer.configs.kotlin.v2019_2.Project
44
fun Project.configureGradleProfilerProject() {
55
description = "Runs tests and integration tests of the Gradle Profiler (https://github.com/gradle/gradle-profiler)"
66

7-
buildType(MacOSJava8)
8-
buildType(WindowsJava8)
9-
buildType(LinuxJava8)
10-
buildType(LinuxJava11)
7+
val testBuilds = listOf(
8+
MacOSJava8,
9+
WindowsJava8,
10+
LinuxJava8,
11+
LinuxJava11
12+
)
1113

14+
testBuilds.forEach(this::buildType)
15+
16+
buildType(GradleProfilerTestTrigger(testBuilds))
1217
buildType(GradleProfilerPublishing)
1318

1419
params {

0 commit comments

Comments
 (0)