Fixing branch selection in TeamCity builds (#2311)

* Enable pull-requests in all builds

Otherwise test builds always use the master branch

* Apply change in settings made in UI

.teamcity/patches/buildTypes/AggregatorBuild.kts

@@ -1,37 +0,0 @@
-package patches.buildTypes
-
-import jetbrains.buildServer.configs.kotlin.v2019_2.*
-import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.CommitStatusPublisher
-import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.commitStatusPublisher
-import jetbrains.buildServer.configs.kotlin.v2019_2.ui.*
-
-/*
-This patch script was generated by TeamCity on settings change in UI.
-To apply the patch, change the buildType with id = 'AggregatorBuild'
-accordingly, and delete the patch script.
-*/
-changeBuildType(RelativeId("AggregatorBuild")) {
-    features {
-        val feature1 = find<CommitStatusPublisher> {
-            commitStatusPublisher {
-                vcsRootExtId = "${DslContext.settingsRoot.id}"
-                publisher = github {
-                    githubUrl = "https://api.github.com"
-                    authType = personalToken {
-                        token = "credentialsJSON:5dc93081-e0b2-41e2-b8f0-dea3c96e6426"
-                    }
-                }
-                param("github_oauth_user", "derekparker")
-            }
-        }
-        feature1.apply {
-            publisher = github {
-                githubUrl = "https://api.github.com"
-                authType = personalToken {
-                    token = "credentialsJSON:48af6e38-536d-4acb-ae2d-2fba57b6f3db"
-                }
-            }
-            param("github_oauth_user", "")
-        }
-    }
-}

.teamcity/settings.kts

@@ -81,24 +81,16 @@ class AggregatorBuild(tests: Collection<BuildType>) : BuildType({
     }
 
     features {
-        pullRequests {
+        enablePullRequests()
-            vcsRootExtId = "${DslContext.settingsRoot.id}"
-            provider = github {
-                authType = token {
-                    token = "credentialsJSON:5dc93081-e0b2-41e2-b8f0-dea3c96e6426"
-                }
-                filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY
-            }
-        }
         commitStatusPublisher {
             vcsRootExtId = "${DslContext.settingsRoot.id}"
             publisher = github {
                 githubUrl = "https://api.github.com"
                 authType = personalToken {
-                    token = "credentialsJSON:5dc93081-e0b2-41e2-b8f0-dea3c96e6426"
+                    token = "credentialsJSON:48af6e38-536d-4acb-ae2d-2fba57b6f3db"
                 }
             }
-            param("github_oauth_user", "derekparker")
+            param("github_oauth_user", "")
         }
     }
 })
@@ -194,8 +186,21 @@ class TestBuild(val os: String, val arch: String, version: String, buildId: Abso
     }
 
     features {
+        enablePullRequests()
         golang {
             testFormat = "json"
         }
     }
 })
+
+fun enablePullRequests() {
+    pullRequests {
+        vcsRootExtId = "${DslContext.settingsRoot.id}"
+        provider = github {
+            authType = token {
+                token = "credentialsJSON:5dc93081-e0b2-41e2-b8f0-dea3c96e6426"
+            }
+            filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY
+        }
+    }
+}