[7.x] [CI] Gate TeamCity PR commit statuses (#88526) | [CI] Fix trail…

…ing comma in TeamCity job DSL (#88533) (#88696)
elastic · Jan 19, 2021 · f2a4168 · f2a4168
1 parent 978f7a3
commit f2a4168
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/.teamcity/src/builds/PullRequestCi.kt b/.teamcity/src/builds/PullRequestCi.kt
@@ -3,6 +3,7 @@ package builds
 import builds.default.DefaultSavedObjectFieldMetrics
 import dependsOn
 import getProjectBranch
+import isReportingEnabled
 import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
 import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.commitStatusPublisher
 import vcs.Kibana
@@ -63,6 +64,7 @@ object PullRequestCi : BuildType({
 
   features {
     commitStatusPublisher {
+      enabled = isReportingEnabled()
       vcsRootExtId = "${Kibana.id}"
       publisher = github {
         githubUrl = "https://api.github.com"

diff --git a/.teamcity/src/builds/test/QuickTests.kt b/.teamcity/src/builds/test/QuickTests.kt
@@ -13,7 +13,7 @@ object QuickTests : BuildType({
 
   val testScripts = mapOf(
     "Test Hardening" to ".ci/teamcity/checks/test_hardening.sh",
-    "Test Projects" to ".ci/teamcity/tests/test_projects.sh",
+    "Test Projects" to ".ci/teamcity/tests/test_projects.sh"
   )
 
   steps {

diff --git a/vars/prChanges.groovy b/vars/prChanges.groovy
@@ -11,8 +11,10 @@ def getSkippablePaths() {
     /^.ci\/.+\.yml$/,
     /^.ci\/es-snapshots\//,
     /^.ci\/pipeline-library\//,
+    /^.ci\/teamcity\//,
     /^.ci\/Jenkinsfile_[^\/]+$/,
     /^\.github\//,
+    /^\.teamcity\//,
     /\.md$/,
   ]
 }